Migrate balances to Attribute Macro (#593)

* remove `Subtrait` * migrate balances to attribute macro * update re-export items * fix compile * try-runtime * fix compile * `Ring` to `Balances` * add migration * update `spec_version`
darwinia-network · Apr 21, 2021 · 4041896 · 4041896
1 parent 349805f
commit 4041896
Show file tree

Hide file tree

Showing 36 changed files with 1,314 additions and 1,231 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/node/runtime/pangolin/Cargo.toml b/bin/node/runtime/pangolin/Cargo.toml
@@ -176,6 +176,7 @@ with-tracing = ["frame-executive/with-tracing"]
 try-runtime = [
 	"frame-executive/try-runtime",
 	"frame-try-runtime",
+	"darwinia-balances/try-runtime",
 	"darwinia-crab-issuing/try-runtime",
 	"darwinia-staking/try-runtime",
 ]
diff --git a/bin/node/runtime/pangolin/src/lib.rs b/bin/node/runtime/pangolin/src/lib.rs
@@ -283,7 +283,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	impl_name: create_runtime_str!("Pangolin"),
 	authoring_version: 1,
 	// crate version ~2.2.0 := >=2.2.0, <2.3.0
-	spec_version: 220,
+	spec_version: 221,
 	impl_version: 1,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -798,11 +798,13 @@ pub struct CustomOnRuntimeUpgrade;
 impl OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
 	#[cfg(feature = "try-runtime")]
 	fn pre_upgrade() -> Result<(), &'static str> {
-		darwinia_crab_issuing::migration::try_runtime::pre_migrate::<Runtime>()?;
-		darwinia_staking::migrations::v6::pre_migrate::<Runtime>()
+		darwinia_balances::migration::try_runtime::pre_migrate()
 	}
 
 	fn on_runtime_upgrade() -> Weight {
-		0
+		darwinia_balances::migration::migrate(b"Instance0DarwiniaBalances", b"Balances");
+		darwinia_balances::migration::migrate(b"Instance1DarwiniaBalances", b"Kton");
+
+		RuntimeBlockWeights::get().max_block
 	}
 }
diff --git a/frame/balances/Cargo.toml b/frame/balances/Cargo.toml
@@ -13,6 +13,7 @@ version     = "2.2.0"
 # crates
 codec = { package = "parity-scale-codec", version = "2.0.1", default-features = false }
 log   = { version = "0.4.14" }
+paste = { version = "1.0.5", optional = true }
 serde = { version = "1.0.125", optional = true }
 # darwinia
 darwinia-balances-rpc-runtime-api = { default-features = false, path = "./rpc/runtime-api" }
@@ -52,3 +53,8 @@ substrate-std = [
 	"sp-runtime/std",
 	"sp-std/std",
 ]
+
+try-runtime = [
+	"paste",
+	"frame-support/try-runtime",
+]