darwinia-network · hackfisher · Jun 28, 2021 · Jun 21, 2021 · Jun 22, 2021 · Jun 22, 2021
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/node/runtime/pangolin/polkadot-compatible-types.json b/bin/node/runtime/pangolin/polkadot-compatible-types.json
@@ -199,6 +199,7 @@
 		"prefix": "[u8; 4; Prefix]",
 		"parent_mmr_root": "Hash"
 	},
+	"NodeIndex": "u64",
 	"__[primitives.relay]__": {},
 	"OpCode": "[u8; 4; OpCode]",
 	"Term": "u32",

diff --git a/bin/node/runtime/pangolin/src/lib.rs b/bin/node/runtime/pangolin/src/lib.rs
@@ -632,7 +632,7 @@ impl_runtime_apis! {
 			block_number_of_member_leaf: u64,
 			block_number_of_last_leaf: u64
 		) -> HeaderMMRRuntimeDispatchInfo<Hash> {
-			HeaderMMR::gen_proof_rpc(block_number_of_member_leaf, block_number_of_last_leaf )
+			HeaderMMR::gen_proof_rpc(block_number_of_member_leaf, block_number_of_last_leaf)
 		}
 	}
 
@@ -852,11 +852,31 @@ pub struct CustomOnRuntimeUpgrade;
 impl OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
 	#[cfg(feature = "try-runtime")]
 	fn pre_upgrade() -> Result<(), &'static str> {
+		// <--- Hack for local test
+		use frame_support::traits::Currency;
+		let _ = Ring::deposit_creating(&BridgeMillauMessages::relayer_fund_account_id(), 1 << 50);
+		// --->
+
+		darwinia_header_mmr::migration::initialize_new_mmr_state::<Runtime>(b"HeaderMMR", 2);
+		darwinia_relay_authorities::migration::migrate::<Runtime, EthereumRelayAuthoritiesInstance>(
+			b"Instance1DarwiniaRelayAuthorities",
+		);
+
 		Ok(())
 	}
 
 	fn on_runtime_upgrade() -> Weight {
-		0
+		// <--- Hack for local test
+		// use frame_support::traits::Currency;
+		// let _ = Ring::deposit_creating(&BridgeMillauMessages::relayer_fund_account_id(), 1 << 50);
+		// --->
+
+		darwinia_header_mmr::migration::initialize_new_mmr_state::<Runtime>(b"HeaderMMR", 50);
+		darwinia_relay_authorities::migration::migrate::<Runtime, EthereumRelayAuthoritiesInstance>(
+			b"Instance1DarwiniaRelayAuthorities",
+		);
+
+		RuntimeBlockWeights::get().max_block
 	}
 }
 

diff --git a/bin/node/runtime/pangolin/src/pallets/header_mmr.rs b/bin/node/runtime/pangolin/src/pallets/header_mmr.rs
@@ -2,4 +2,8 @@
 use crate::*;
 use darwinia_header_mmr::Config;
 
-impl Config for Runtime {}
+impl Config for Runtime {
+	type WeightInfo = ();
+
+	const INDEXING_PREFIX: &'static [u8] = b"header-mmr-";
+}
diff --git a/bin/node/runtime/pangolin/types.json b/bin/node/runtime/pangolin/types.json
@@ -191,6 +191,7 @@
 		"prefix": "[u8; 4; Prefix]",
 		"parent_mmr_root": "Hash"
 	},
+	"NodeIndex": "u64",
 	"__[primitives.relay]__": {},
 	"OpCode": "[u8; 4; OpCode]",
 	"Term": "u32",

diff --git a/frame/bridge/ethereum/backing/src/lib.rs b/frame/bridge/ethereum/backing/src/lib.rs
@@ -410,7 +410,7 @@ pub mod pallet {
 					(<frame_system::Pallet<T>>::block_number().saturated_into::<u32>() / 10 * 10
 						+ 10)
 						.saturated_into(),
-				);
+				)?;
 			}
 
 			Ok(().into())

diff --git a/frame/bridge/ethereum/backing/src/mock.rs b/frame/bridge/ethereum/backing/src/mock.rs
@@ -186,7 +186,9 @@ macro_rules! decl_tests {
 		impl RelayAuthorityProtocol<BlockNumber> for EcdsaAuthorities {
 			type Signer = EthereumAddress;
 
-			fn schedule_mmr_root(_: BlockNumber) {}
+			fn schedule_mmr_root(_: BlockNumber) -> DispatchResult {
+				Ok(())
+			}
 
 			fn check_authorities_change_to_sync(_: Term, _: Vec<Self::Signer>) -> DispatchResult {
 				Ok(())

diff --git a/frame/bridge/relay-authorities/Cargo.toml b/frame/bridge/relay-authorities/Cargo.toml
@@ -12,6 +12,7 @@ version     = "2.4.0"
 [dependencies]
 # crates
 codec = { package = "parity-scale-codec", version = "2.1.1", default-features = false, features = ["derive"] }
+log   = { version = "0.4.14" }
 # darwinia
 darwinia-relay-primitives = { default-features = false, path = "../../../primitives/relay" }
 darwinia-support          = { default-features = false, path = "../../support" }
@@ -25,11 +26,13 @@ sp-std        = { default-features = false, git = "https://github.com/darwinia-n
 # crates
 array-bytes = { version = "1.3.3" }
 # darwinia
-darwinia-balances = { path = "../../balances" }
-darwinia-support  = { path = "../../support" }
+darwinia-balances   = { path = "../../balances" }
+darwinia-header-mmr = { features = ["easy-testing"], path = "../../header-mmr" }
+darwinia-support    = { path = "../../support" }
 # substrate
-sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.1" }
-sp-io   = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.1" }
+sp-core    = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.1" }
+sp-io      = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.1" }
+sp-tracing = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.1" }
 
 [features]
 default = ["std"]
-Original file line number
+Diff line change
@@ Expand Up / @@ -410,7 +410,7 @@ pub mod pallet { @@
     					(<frame_system::Pallet<T>>::block_number().saturated_into::<u32>() / 10 * 10
     						+ 10)
     						.saturated_into(),
-    				);
+    				)?;
     			}
     			Ok(().into())
@@ Expand Down @@