diff --git a/Cargo.lock b/Cargo.lock
index bc7acd6c..b5c67880 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -15,7 +15,7 @@ dependencies = [
 [[package]]
 name = "account"
 version = "0.1.1"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.36#f3189a08c5166f1ac53022445ae9e83a2d34e426"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.36#dee535191703eecd6039e182f861f61aced6611f"
 dependencies = [
  "blake2-rfc",
  "hex",
@@ -706,7 +706,7 @@ dependencies = [
 [[package]]
 name = "bp-darwinia-core"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#493a685cb279a38ca8e4d6a768dd8da48c474547"
+source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#bc692858e95a823f863fe45b9f0415db4ec2e159"
 dependencies = [
  "account",
  "bp-messages",
@@ -723,7 +723,7 @@ dependencies = [
 [[package]]
 name = "bp-header-chain"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#493a685cb279a38ca8e4d6a768dd8da48c474547"
+source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#bc692858e95a823f863fe45b9f0415db4ec2e159"
 dependencies = [
  "bp-runtime",
  "finality-grandpa",
@@ -740,7 +740,7 @@ dependencies = [
 [[package]]
 name = "bp-message-dispatch"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#493a685cb279a38ca8e4d6a768dd8da48c474547"
+source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#bc692858e95a823f863fe45b9f0415db4ec2e159"
 dependencies = [
  "bp-runtime",
  "frame-support",
@@ -753,7 +753,7 @@ dependencies = [
 [[package]]
 name = "bp-messages"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#493a685cb279a38ca8e4d6a768dd8da48c474547"
+source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#bc692858e95a823f863fe45b9f0415db4ec2e159"
 dependencies = [
  "bitvec",
  "bp-runtime",
@@ -770,7 +770,7 @@ dependencies = [
 [[package]]
 name = "bp-parachains"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#493a685cb279a38ca8e4d6a768dd8da48c474547"
+source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#bc692858e95a823f863fe45b9f0415db4ec2e159"
 dependencies = [
  "bp-polkadot-core",
  "bp-runtime",
@@ -783,7 +783,7 @@ dependencies = [
 [[package]]
 name = "bp-polkadot-core"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#493a685cb279a38ca8e4d6a768dd8da48c474547"
+source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#bc692858e95a823f863fe45b9f0415db4ec2e159"
 dependencies = [
  "bp-messages",
  "bp-runtime",
@@ -803,7 +803,7 @@ dependencies = [
 [[package]]
 name = "bp-runtime"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#493a685cb279a38ca8e4d6a768dd8da48c474547"
+source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#bc692858e95a823f863fe45b9f0415db4ec2e159"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -824,7 +824,7 @@ dependencies = [
 [[package]]
 name = "bp-test-utils"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#493a685cb279a38ca8e4d6a768dd8da48c474547"
+source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#bc692858e95a823f863fe45b9f0415db4ec2e159"
 dependencies = [
  "bp-header-chain",
  "ed25519-dalek",
@@ -839,7 +839,7 @@ dependencies = [
 [[package]]
 name = "bridge-runtime-common"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#493a685cb279a38ca8e4d6a768dd8da48c474547"
+source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#bc692858e95a823f863fe45b9f0415db4ec2e159"
 dependencies = [
  "bp-header-chain",
  "bp-message-dispatch",
@@ -1323,7 +1323,7 @@ dependencies = [
  "pallet-democracy",
  "pallet-elections-phragmen",
  "pallet-ethereum",
- "pallet-evm 6.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "pallet-evm",
  "pallet-evm-precompile-blake2",
  "pallet-evm-precompile-bn128",
  "pallet-evm-precompile-dispatch",
@@ -2188,7 +2188,7 @@ dependencies = [
  "fc-mapping-sync",
  "fc-rpc",
  "fc-rpc-core",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "fp-evm",
  "fp-rpc",
  "fp-storage",
  "frame-benchmarking",
@@ -2333,7 +2333,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-balances",
- "pallet-evm 6.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "pallet-evm",
  "pallet-timestamp",
  "parity-scale-codec",
  "scale-info",
@@ -2352,7 +2352,7 @@ dependencies = [
  "bp-runtime",
  "ethereum",
  "fp-ethereum",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "fp-evm",
  "fp-self-contained",
  "frame-support",
  "frame-system",
@@ -2360,7 +2360,7 @@ dependencies = [
  "pallet-balances",
  "pallet-bridge-dispatch",
  "pallet-ethereum",
- "pallet-evm 6.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "pallet-evm",
  "pallet-timestamp",
  "parity-scale-codec",
  "precompile-utils",
@@ -2377,12 +2377,12 @@ dependencies = [
 name = "darwinia-precompile-assets"
 version = "6.0.0"
 dependencies = [
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "fp-evm",
  "frame-support",
  "frame-system",
  "pallet-assets",
  "pallet-balances",
- "pallet-evm 6.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "pallet-evm",
  "pallet-timestamp",
  "parity-scale-codec",
  "precompile-utils",
@@ -2398,11 +2398,11 @@ dependencies = [
 name = "darwinia-precompile-bls12-381"
 version = "6.0.0"
 dependencies = [
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "fp-evm",
  "frame-system",
  "milagro_bls",
  "pallet-balances",
- "pallet-evm 6.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "pallet-evm",
  "pallet-timestamp",
  "parity-scale-codec",
  "precompile-utils",
@@ -2418,11 +2418,11 @@ name = "darwinia-precompile-deposit"
 version = "6.0.0"
 dependencies = [
  "darwinia-deposit",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "fp-evm",
  "frame-support",
  "frame-system",
  "pallet-balances",
- "pallet-evm 6.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "pallet-evm",
  "pallet-timestamp",
  "parity-scale-codec",
  "precompile-utils",
@@ -2439,11 +2439,11 @@ version = "6.0.0"
 dependencies = [
  "darwinia-deposit",
  "darwinia-staking",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "fp-evm",
  "frame-support",
  "frame-system",
  "pallet-balances",
- "pallet-evm 6.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "pallet-evm",
  "pallet-timestamp",
  "parity-scale-codec",
  "precompile-utils",
@@ -2458,11 +2458,11 @@ dependencies = [
 name = "darwinia-precompile-state-storage"
 version = "6.0.0"
 dependencies = [
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "fp-evm",
  "frame-support",
  "frame-system",
  "pallet-balances",
- "pallet-evm 6.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "pallet-evm",
  "pallet-timestamp",
  "parity-scale-codec",
  "precompile-utils",
@@ -2526,7 +2526,7 @@ dependencies = [
  "pallet-democracy",
  "pallet-elections-phragmen",
  "pallet-ethereum",
- "pallet-evm 6.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "pallet-evm",
  "pallet-evm-precompile-blake2",
  "pallet-evm-precompile-bn128",
  "pallet-evm-precompile-dispatch",
@@ -3502,26 +3502,13 @@ source = "git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36#a03
 dependencies = [
  "ethereum",
  "ethereum-types 0.14.1",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "fp-evm",
  "frame-support",
  "num_enum",
  "parity-scale-codec",
  "sp-std",
 ]
 
-[[package]]
-name = "fp-evm"
-version = "3.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36#bee8cbfc3ffb09f271ac39785ab0ddfe281ee63c"
-dependencies = [
- "evm",
- "frame-support",
- "parity-scale-codec",
- "serde",
- "sp-core",
- "sp-std",
-]
-
 [[package]]
 name = "fp-evm"
 version = "3.0.0-dev"
@@ -3542,7 +3529,7 @@ source = "git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36#a03
 dependencies = [
  "ethereum",
  "ethereum-types 0.14.1",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "fp-evm",
  "parity-scale-codec",
  "scale-info",
  "sp-api",
@@ -6389,13 +6376,12 @@ dependencies = [
 [[package]]
 name = "pallet-bridge-dispatch"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#493a685cb279a38ca8e4d6a768dd8da48c474547"
+source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#bc692858e95a823f863fe45b9f0415db4ec2e159"
 dependencies = [
  "bp-message-dispatch",
  "bp-runtime",
  "frame-support",
  "frame-system",
- "pallet-root-testing",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
@@ -6406,7 +6392,7 @@ dependencies = [
 [[package]]
 name = "pallet-bridge-grandpa"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#493a685cb279a38ca8e4d6a768dd8da48c474547"
+source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#bc692858e95a823f863fe45b9f0415db4ec2e159"
 dependencies = [
  "bp-header-chain",
  "bp-runtime",
@@ -6428,7 +6414,7 @@ dependencies = [
 [[package]]
 name = "pallet-bridge-messages"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#493a685cb279a38ca8e4d6a768dd8da48c474547"
+source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#bc692858e95a823f863fe45b9f0415db4ec2e159"
 dependencies = [
  "bitvec",
  "bp-message-dispatch",
@@ -6449,7 +6435,7 @@ dependencies = [
 [[package]]
 name = "pallet-bridge-parachains"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#493a685cb279a38ca8e4d6a768dd8da48c474547"
+source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#bc692858e95a823f863fe45b9f0415db4ec2e159"
 dependencies = [
  "bp-parachains",
  "bp-polkadot-core",
@@ -6603,13 +6589,13 @@ dependencies = [
  "evm",
  "fp-consensus",
  "fp-ethereum",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "fp-evm",
  "fp-rpc",
  "fp-self-contained",
  "fp-storage",
  "frame-support",
  "frame-system",
- "pallet-evm 6.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "pallet-evm",
  "pallet-timestamp",
  "parity-scale-codec",
  "rlp",
@@ -6619,31 +6605,6 @@ dependencies = [
  "sp-std",
 ]
 
-[[package]]
-name = "pallet-evm"
-version = "6.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36#bee8cbfc3ffb09f271ac39785ab0ddfe281ee63c"
-dependencies = [
- "environmental",
- "evm",
- "fp-evm 3.0.0-dev (git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36)",
- "frame-benchmarking",
- "frame-support",
- "frame-system",
- "hex",
- "log",
- "pallet-timestamp",
- "parity-scale-codec",
- "primitive-types 0.12.1",
- "rlp",
- "scale-info",
- "serde",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std",
-]
-
 [[package]]
 name = "pallet-evm"
 version = "6.0.0-dev"
@@ -6651,7 +6612,7 @@ source = "git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36#a03
 dependencies = [
  "environmental",
  "evm",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "fp-evm",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -6672,7 +6633,7 @@ name = "pallet-evm-precompile-blake2"
 version = "2.0.0-dev"
 source = "git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36#a032072a623417d3febdcd060464f885bd76103e"
 dependencies = [
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "fp-evm",
 ]
 
 [[package]]
@@ -6680,7 +6641,7 @@ name = "pallet-evm-precompile-bn128"
 version = "2.0.0-dev"
 source = "git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36#a032072a623417d3febdcd060464f885bd76103e"
 dependencies = [
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "fp-evm",
  "sp-core",
  "substrate-bn",
 ]
@@ -6690,9 +6651,9 @@ name = "pallet-evm-precompile-dispatch"
 version = "2.0.0-dev"
 source = "git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36#a032072a623417d3febdcd060464f885bd76103e"
 dependencies = [
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "fp-evm",
  "frame-support",
- "pallet-evm 6.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "pallet-evm",
 ]
 
 [[package]]
@@ -6700,7 +6661,7 @@ name = "pallet-evm-precompile-modexp"
 version = "2.0.0-dev"
 source = "git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36#a032072a623417d3febdcd060464f885bd76103e"
 dependencies = [
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "fp-evm",
  "num",
 ]
 
@@ -6709,7 +6670,7 @@ name = "pallet-evm-precompile-simple"
 version = "2.0.0-dev"
 source = "git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36#a032072a623417d3febdcd060464f885bd76103e"
 dependencies = [
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "fp-evm",
  "ripemd",
  "sp-io",
 ]
@@ -6735,7 +6696,7 @@ dependencies = [
 [[package]]
 name = "pallet-fee-market"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#493a685cb279a38ca8e4d6a768dd8da48c474547"
+source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=prepare-polkadot-v0.9.36#bc692858e95a823f863fe45b9f0415db4ec2e159"
 dependencies = [
  "bp-messages",
  "bp-runtime",
@@ -7064,21 +7025,6 @@ dependencies = [
  "sp-std",
 ]
 
-[[package]]
-name = "pallet-root-testing"
-version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51"
-dependencies = [
- "frame-support",
- "frame-system",
- "parity-scale-codec",
- "scale-info",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std",
-]
-
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
@@ -7453,7 +7399,7 @@ dependencies = [
  "pallet-democracy",
  "pallet-elections-phragmen",
  "pallet-ethereum",
- "pallet-evm 6.0.0-dev (git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36)",
+ "pallet-evm",
  "pallet-evm-precompile-blake2",
  "pallet-evm-precompile-bn128",
  "pallet-evm-precompile-dispatch",
@@ -8994,12 +8940,12 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 [[package]]
 name = "precompile-utils"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.36#f3189a08c5166f1ac53022445ae9e83a2d34e426"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.36#dee535191703eecd6039e182f861f61aced6611f"
 dependencies = [
  "affix",
  "derive_more",
  "evm",
- "fp-evm 3.0.0-dev (git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36)",
+ "fp-evm",
  "frame-support",
  "frame-system",
  "hex",
@@ -9007,7 +8953,7 @@ dependencies = [
  "impl-trait-for-tuples",
  "log",
  "num_enum",
- "pallet-evm 6.0.0-dev (git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36)",
+ "pallet-evm",
  "parity-scale-codec",
  "paste",
  "precompile-utils-macro",
@@ -9024,7 +8970,7 @@ dependencies = [
 [[package]]
 name = "precompile-utils-macro"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.36#f3189a08c5166f1ac53022445ae9e83a2d34e426"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.36#dee535191703eecd6039e182f861f61aced6611f"
 dependencies = [
  "case",
  "num_enum",
@@ -13949,7 +13895,7 @@ dependencies = [
 [[package]]
 name = "xcm-primitives"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.36#f3189a08c5166f1ac53022445ae9e83a2d34e426"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.36#dee535191703eecd6039e182f861f61aced6611f"
 dependencies = [
  "ethereum",
  "ethereum-types 0.14.1",