diff --git a/Cargo.lock b/Cargo.lock
index 4ac065b69..76f843bc4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -162,7 +162,7 @@ checksum = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034"
 [[package]]
 name = "array-bytes"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "sp-std 2.0.0",
 ]
@@ -184,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "arrayvec"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 
 [[package]]
 name = "asn1_der"
@@ -326,7 +326,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df097e3f506bec0e1a24f06bb3c962c228f36671de841ff579cb99f371772634"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "rustls",
  "webpki",
  "webpki-roots 0.19.0",
@@ -511,7 +511,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
 dependencies = [
  "arrayref",
- "arrayvec 0.5.1",
+ "arrayvec 0.5.2",
  "constant_time_eq",
 ]
 
@@ -522,7 +522,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab9e07352b829279624ceb7c64adb4f585dacdb81d35cafae81139ccd617cf44"
 dependencies = [
  "arrayref",
- "arrayvec 0.5.1",
+ "arrayvec 0.5.2",
  "constant_time_eq",
 ]
 
@@ -865,7 +865,7 @@ checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
 
 [[package]]
 name = "crab-runtime"
-version = "0.7.3"
+version = "0.7.4"
 dependencies = [
  "darwinia-balances",
  "darwinia-balances-rpc-runtime-api",
@@ -1202,12 +1202,12 @@ dependencies = [
 
 [[package]]
 name = "darwinia"
-version = "0.7.3"
+version = "0.7.4"
 dependencies = [
  "assert_cmd",
- "darwinia-cli 0.7.3",
+ "darwinia-cli 0.7.4",
  "darwinia-service",
- "futures 0.3.6",
+ "futures 0.3.7",
  "nix 0.19.0",
  "parity-util-mem",
  "tempfile",
@@ -1216,7 +1216,7 @@ dependencies = [
 [[package]]
 name = "darwinia-balances"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "darwinia-balances-rpc-runtime-api",
  "darwinia-support",
@@ -1231,7 +1231,7 @@ dependencies = [
 [[package]]
 name = "darwinia-balances-rpc"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "darwinia-balances-rpc-runtime-api",
  "jsonrpc-core",
@@ -1246,7 +1246,7 @@ dependencies = [
 [[package]]
 name = "darwinia-balances-rpc-runtime-api"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "darwinia-support",
  "parity-scale-codec",
@@ -1258,7 +1258,7 @@ dependencies = [
 [[package]]
 name = "darwinia-claims"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "array-bytes",
  "darwinia-support",
@@ -1274,7 +1274,7 @@ dependencies = [
 
 [[package]]
 name = "darwinia-cli"
-version = "0.7.3"
+version = "0.7.4"
 dependencies = [
  "darwinia-cli 1.0.0",
  "darwinia-service",
@@ -1300,7 +1300,7 @@ dependencies = [
 [[package]]
 name = "darwinia-cli"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "sc-cli",
  "sc-client-api",
@@ -1313,7 +1313,7 @@ dependencies = [
 [[package]]
 name = "darwinia-crab-backing"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1325,7 +1325,7 @@ dependencies = [
 [[package]]
 name = "darwinia-crab-issuing"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1337,7 +1337,7 @@ dependencies = [
 [[package]]
 name = "darwinia-democracy"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "darwinia-support",
  "frame-support",
@@ -1352,7 +1352,7 @@ dependencies = [
 [[package]]
 name = "darwinia-elections-phragmen"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "darwinia-support",
  "frame-support",
@@ -1367,7 +1367,7 @@ dependencies = [
 [[package]]
 name = "darwinia-ethereum-backing"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "array-bytes",
  "darwinia-support",
@@ -1386,7 +1386,7 @@ dependencies = [
 [[package]]
 name = "darwinia-ethereum-relay"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "array-bytes",
  "blake2-rfc",
@@ -1410,7 +1410,7 @@ dependencies = [
 [[package]]
 name = "darwinia-header-mmr"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "ckb-merkle-mountain-range",
  "darwinia-header-mmr-rpc-runtime-api",
@@ -1426,7 +1426,7 @@ dependencies = [
 [[package]]
 name = "darwinia-header-mmr-rpc"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "darwinia-header-mmr-rpc-runtime-api",
  "jsonrpc-core",
@@ -1441,7 +1441,7 @@ dependencies = [
 [[package]]
 name = "darwinia-header-mmr-rpc-runtime-api"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "darwinia-support",
  "parity-scale-codec",
@@ -1453,7 +1453,7 @@ dependencies = [
 
 [[package]]
 name = "darwinia-primitives"
-version = "0.7.3"
+version = "0.7.4"
 dependencies = [
  "frame-system",
  "parity-scale-codec",
@@ -1465,7 +1465,7 @@ dependencies = [
 [[package]]
 name = "darwinia-relay-primitives"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -1476,7 +1476,7 @@ dependencies = [
 [[package]]
 name = "darwinia-relayer-game"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "darwinia-relay-primitives",
  "darwinia-support",
@@ -1490,7 +1490,7 @@ dependencies = [
 
 [[package]]
 name = "darwinia-rpc"
-version = "0.7.3"
+version = "0.7.4"
 dependencies = [
  "darwinia-balances-rpc",
  "darwinia-header-mmr-rpc",
@@ -1519,7 +1519,7 @@ dependencies = [
 
 [[package]]
 name = "darwinia-runtime"
-version = "0.7.3"
+version = "0.7.4"
 dependencies = [
  "darwinia-balances",
  "darwinia-balances-rpc-runtime-api",
@@ -1589,7 +1589,7 @@ dependencies = [
 
 [[package]]
 name = "darwinia-runtime-common"
-version = "0.7.3"
+version = "0.7.4"
 dependencies = [
  "darwinia-balances",
  "darwinia-primitives",
@@ -1607,7 +1607,7 @@ dependencies = [
 
 [[package]]
 name = "darwinia-service"
-version = "0.7.3"
+version = "0.7.4"
 dependencies = [
  "array-bytes",
  "crab-runtime",
@@ -1618,7 +1618,7 @@ dependencies = [
  "darwinia-runtime",
  "darwinia-staking-rpc-runtime-api",
  "frame-system-rpc-runtime-api",
- "futures 0.3.6",
+ "futures 0.3.7",
  "log",
  "pallet-im-online",
  "pallet-transaction-payment-rpc-runtime-api",
@@ -1658,7 +1658,7 @@ dependencies = [
 [[package]]
 name = "darwinia-staking"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "darwinia-staking-rpc-runtime-api",
  "darwinia-support",
@@ -1682,7 +1682,7 @@ dependencies = [
 [[package]]
 name = "darwinia-staking-rpc"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "darwinia-staking-rpc-runtime-api",
  "jsonrpc-core",
@@ -1697,7 +1697,7 @@ dependencies = [
 [[package]]
 name = "darwinia-staking-rpc-runtime-api"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "darwinia-support",
  "parity-scale-codec",
@@ -1709,7 +1709,7 @@ dependencies = [
 [[package]]
 name = "darwinia-support"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "ethereum-primitives",
  "frame-support",
@@ -1723,7 +1723,7 @@ dependencies = [
 [[package]]
 name = "darwinia-treasury"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "darwinia-support",
  "frame-support",
@@ -1737,7 +1737,7 @@ dependencies = [
 [[package]]
 name = "darwinia-tron-backing"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1749,7 +1749,7 @@ dependencies = [
 [[package]]
 name = "darwinia-vesting"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "darwinia-support",
  "enumflags2",
@@ -1945,9 +1945,9 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eab5ee3df98a279d9b316b1af6ac95422127b1290317e6d18c1743c99418b01"
+checksum = "fa68f2fb9cae9d37c9b2b3584aba698a2e97f72d7aef7b9f7aa71d8b54ce46fe"
 dependencies = [
  "errno-dragonfly",
  "libc",
@@ -2006,7 +2006,7 @@ dependencies = [
 [[package]]
 name = "ethereum-primitives"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "array-bytes",
  "ethash",
@@ -2053,7 +2053,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
 ]
 
 [[package]]
@@ -2125,7 +2125,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8feb87a63249689640ac9c011742c33139204e3c134293d3054022276869133b"
 dependencies = [
  "either",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-timer 2.0.2",
  "log",
  "num-traits",
@@ -2365,9 +2365,9 @@ checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed"
 
 [[package]]
 name = "futures"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d8e3078b7b2a8a671cb7a3d17b4760e4181ea243227776ba83fd043b4ca034e"
+checksum = "95314d38584ffbfda215621d723e0a3906f032e03ae5551e650058dac83d4797"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2380,9 +2380,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a4d35f7401e948629c9c3d6638fb9bf94e0b2121e96c3b428cc4e631f3eb74"
+checksum = "0448174b01148032eed37ac4aed28963aaaa8cfa93569a08e5b479bbc6c2c151"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2399,9 +2399,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d674eaa0056896d5ada519900dbf97ead2e46a7b6621e8160d79e2f2e1e2784b"
+checksum = "18eaa56102984bed2c88ea39026cff3ce3b4c7f508ca970cedf2450ea10d4e46"
 
 [[package]]
 name = "futures-core-preview"
@@ -2426,7 +2426,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdcef58a173af8148b182684c9f2d5250875adbcaff7b5794073894f9d8634a9"
 dependencies = [
  "futures 0.1.30",
- "futures 0.3.6",
+ "futures 0.3.7",
  "lazy_static",
  "log",
  "parking_lot 0.9.0",
@@ -2437,9 +2437,9 @@ dependencies = [
 
 [[package]]
 name = "futures-executor"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc709ca1da6f66143b8c9bec8e6260181869893714e9b5a490b169b0414144ab"
+checksum = "f5f8e0c9258abaea85e78ebdda17ef9666d390e987f006be6080dfe354b708cb"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2449,9 +2449,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc94b64bb39543b4e432f1790b6bf18e3ee3b74653c5449f63310e9a74b123c"
+checksum = "6e1798854a4727ff944a7b12aa999f58ce7aa81db80d2dfaaf2ba06f065ddd2b"
 
 [[package]]
 name = "futures-lite"
@@ -2470,9 +2470,9 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f57ed14da4603b2554682e9f2ff3c65d7567b53188db96cb71538217fc64581b"
+checksum = "e36fccf3fc58563b4a14d265027c627c3b665d7fed489427e88e7cc929559efe"
 dependencies = [
  "proc-macro-hack",
  "proc-macro2",
@@ -2482,15 +2482,15 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8764258ed64ebc5d9ed185cf86a95db5cac810269c5d20ececb32e0088abbd"
+checksum = "0e3ca3f17d6e8804ae5d3df7a7d35b2b3a6fe89dac84b31872720fc3060a0b11"
 
 [[package]]
 name = "futures-task"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dd26820a9f3637f1302da8bceba3ff33adbe53464b54ca24d4e2d4f1db30f94"
+checksum = "96d502af37186c4fef99453df03e374683f8a1eec9dcc1e66b3b82dc8278ce3c"
 dependencies = [
  "once_cell 1.4.1",
 ]
@@ -2513,9 +2513,9 @@ dependencies = [
 
 [[package]]
 name = "futures-util"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a894a0acddba51a2d49a6f4263b1e64b8c579ece8af50fa86503d52cd1eea34"
+checksum = "abcb44342f62e6f3e8ac427b8aa815f724fd705dfad060b18ac7866c15bb8e34"
 dependencies = [
  "futures 0.1.30",
  "futures-channel",
@@ -2525,7 +2525,7 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project 0.4.27",
+ "pin-project 1.0.1",
  "pin-utils",
  "proc-macro-hack",
  "proc-macro-nested",
@@ -2551,7 +2551,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce54d63f8b0c75023ed920d46fd71d0cbbb830b0ee012726b5b4f506fb6dea5b"
 dependencies = [
  "bytes 0.5.6",
- "futures 0.3.6",
+ "futures 0.3.7",
  "memchr",
  "pin-project 0.4.27",
 ]
@@ -2717,9 +2717,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "993f9e0baeed60001cf565546b0d3dbe6a6ad23f2bd31644a133c641eccf6d53"
+checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -2732,6 +2732,7 @@ dependencies = [
  "tokio 0.2.22",
  "tokio-util",
  "tracing",
+ "tracing-futures",
 ]
 
 [[package]]
@@ -2950,7 +2951,7 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.2.6",
+ "h2 0.2.7",
  "http 0.2.1",
  "http-body 0.3.1",
  "httparse",
@@ -3081,11 +3082,11 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63312a18f7ea8760cdd0a7c5aac1a619752a246b833545e3e36d1f81f7cd9e66"
+checksum = "cb1fc4429a33e1f80d41dc9fea4d108a88bec1de8053878898ae448a0b52f613"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -3103,7 +3104,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-timer 2.0.2",
 ]
 
@@ -3392,7 +3393,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2701a1369d6ea4f1b9f606db46e5e2a4a8e47f22530a07823d653f85ab1f6c34"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "js-sys",
  "kvdb",
  "kvdb-memorydb",
@@ -3423,9 +3424,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
 
 [[package]]
 name = "libc"
-version = "0.2.79"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2448f6066e80e3bfc792e9c98bf705b4b0fc6e8ef5b43e5889aff0eaa9c58743"
+checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
 
 [[package]]
 name = "libloading"
@@ -3451,7 +3452,7 @@ checksum = "571f5a4604c1a40d75651da141dfde29ad15329f537a779528803297d2220274"
 dependencies = [
  "atomic",
  "bytes 0.5.6",
- "futures 0.3.6",
+ "futures 0.3.7",
  "lazy_static",
  "libp2p-core",
  "libp2p-core-derive",
@@ -3493,7 +3494,7 @@ dependencies = [
  "ed25519-dalek",
  "either",
  "fnv",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-timer 3.0.2",
  "lazy_static",
  "libsecp256k1",
@@ -3533,7 +3534,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74029ae187f35f4b8ddf26b9779a68b340045d708528a103917cdca49a296db5"
 dependencies = [
  "flate2",
- "futures 0.3.6",
+ "futures 0.3.7",
  "libp2p-core",
 ]
 
@@ -3543,7 +3544,7 @@ version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7cf319822e08dd65c8e060d2354e9f952895bbc433f5706c75ed010c152aee5e"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "libp2p-core",
  "log",
 ]
@@ -3556,7 +3557,7 @@ checksum = "d8a9acb43a3e4a4e413e0c4abe0fa49308df7c6335c88534757b647199cb8a51"
 dependencies = [
  "cuckoofilter",
  "fnv",
- "futures 0.3.6",
+ "futures 0.3.7",
  "libp2p-core",
  "libp2p-swarm",
  "prost",
@@ -3575,7 +3576,7 @@ dependencies = [
  "byteorder 1.3.4",
  "bytes 0.5.6",
  "fnv",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures_codec",
  "hex_fmt",
  "libp2p-core",
@@ -3597,7 +3598,7 @@ version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56396ee63aa9164eacf40c2c5d2bda8c4133c2f57e1b0425d51d3a4e362583b1"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3613,11 +3614,11 @@ version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc7fa9047f8b8f544278a35c2d9d45d3b2c1785f2d86d4e1629d6edf97be3955"
 dependencies = [
- "arrayvec 0.5.1",
+ "arrayvec 0.5.2",
  "bytes 0.5.6",
  "either",
  "fnv",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures_codec",
  "libp2p-core",
  "libp2p-swarm",
@@ -3644,7 +3645,7 @@ dependencies = [
  "data-encoding",
  "dns-parser",
  "either",
- "futures 0.3.6",
+ "futures 0.3.7",
  "lazy_static",
  "libp2p-core",
  "libp2p-swarm",
@@ -3664,7 +3665,7 @@ checksum = "8a73a799cc8410b36e40b8f4c4b6babbcb9efd3727111bf517876e4acfa612d3"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures_codec",
  "libp2p-core",
  "log",
@@ -3680,7 +3681,7 @@ checksum = "6ef6c490042f549fb1025f2892dfe6083d97a77558f450c1feebe748ca9eb15a"
 dependencies = [
  "bytes 0.5.6",
  "curve25519-dalek 2.1.0",
- "futures 0.3.6",
+ "futures 0.3.7",
  "lazy_static",
  "libp2p-core",
  "log",
@@ -3700,7 +3701,7 @@ version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad063c21dfcea4518ac9e8bd4119d33a5b26c41e674f602f41f05617a368a5c8"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3716,7 +3717,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "903a12e99c72dbebefea258de887982adeacc7025baa1ceb10b7fa9928f54791"
 dependencies = [
  "bytes 0.5.6",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures_codec",
  "libp2p-core",
  "log",
@@ -3733,7 +3734,7 @@ version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96b3c2d5d26a9500e959a0e19743897239a6c4be78dadf99b70414301a70c006"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "log",
  "pin-project 0.4.27",
  "rand 0.7.3",
@@ -3749,7 +3750,7 @@ checksum = "9c0c9e8a4cd69d97e9646c54313d007512f411aba8c5226cfcda16df6a6e84a3"
 dependencies = [
  "async-trait",
  "bytes 0.5.6",
- "futures 0.3.6",
+ "futures 0.3.7",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3768,7 +3769,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7193e444210132237b81b755ec7fe53f1c4bd2f53cf719729b94c0c72eb6eaa1"
 dependencies = [
  "either",
- "futures 0.3.6",
+ "futures 0.3.7",
  "libp2p-core",
  "log",
  "rand 0.7.3",
@@ -3784,7 +3785,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44f42ec130d7a37a7e47bf4398026b7ad9185c08ed26972e2720f8b94112796f"
 dependencies = [
  "async-std",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-timer 3.0.2",
  "get_if_addrs",
  "ipnet",
@@ -3800,7 +3801,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dea7acb0a034f70d7db94c300eba3f65c0f6298820105624088a9609c9974d77"
 dependencies = [
  "async-std",
- "futures 0.3.6",
+ "futures 0.3.7",
  "libp2p-core",
  "log",
 ]
@@ -3811,7 +3812,7 @@ version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34c1faac6f92c21fbe155417957863ea822fba9e9fd5eb24c0912336a100e63f"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "js-sys",
  "libp2p-core",
  "parity-send-wrapper",
@@ -3827,7 +3828,7 @@ checksum = "d650534ebd99f48f6fa292ed5db10d30df2444943afde4407ceeddab8e513fca"
 dependencies = [
  "async-tls",
  "either",
- "futures 0.3.6",
+ "futures 0.3.7",
  "libp2p-core",
  "log",
  "quicksink",
@@ -3845,7 +3846,7 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "781d9b9f043dcdabc40640807125368596b849fd4d96cdca2dcf052fdf6f33fd"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "libp2p-core",
  "parking_lot 0.11.0",
  "thiserror",
@@ -4074,7 +4075,7 @@ checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882"
 [[package]]
 name = "merkle-patricia-trie"
 version = "1.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#a1eec346c4c37013061ef901a612cd031411e3b6"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#241cac7010fd96e8b1767e0f9a50fc9623dd6c36"
 dependencies = [
  "hashbrown 0.9.1",
  "keccak-hash",
@@ -4234,7 +4235,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "36a6aa6e32fbaf16795142335967214b8564a7a4661eb6dc846ef343a6e00ac1"
 dependencies = [
  "bytes 0.5.6",
- "futures 0.3.6",
+ "futures 0.3.7",
  "log",
  "pin-project 1.0.1",
  "smallvec 1.4.2",
@@ -4906,7 +4907,7 @@ version = "1.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c740e5fbcb6847058b40ac7e5574766c6388f585e184d769910fe0d3a2ca861"
 dependencies = [
- "arrayvec 0.5.1",
+ "arrayvec 0.5.2",
  "bitvec",
  "byte-slice-cast",
  "parity-scale-codec-derive",
@@ -5965,7 +5966,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "pin-project 0.4.27",
  "static_assertions",
 ]
@@ -6002,7 +6003,7 @@ dependencies = [
  "bytes 0.5.6",
  "derive_more",
  "either",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -6027,7 +6028,7 @@ name = "sc-basic-authorship"
 version = "0.8.0"
 source = "git+https://github.com/darwinia-network/substrate.git?branch=common-library#7314a78d49d0dc3862c6ef7c8115cb1b3d0c0fd2"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -6102,7 +6103,7 @@ dependencies = [
  "chrono",
  "derive_more",
  "fdlimit",
- "futures 0.3.6",
+ "futures 0.3.7",
  "hex",
  "lazy_static",
  "libp2p",
@@ -6147,7 +6148,7 @@ source = "git+https://github.com/darwinia-network/substrate.git?branch=common-li
 dependencies = [
  "derive_more",
  "fnv",
- "futures 0.3.6",
+ "futures 0.3.7",
  "hash-db",
  "hex-literal",
  "kvdb",
@@ -6224,7 +6225,7 @@ source = "git+https://github.com/darwinia-network/substrate.git?branch=common-li
 dependencies = [
  "derive_more",
  "fork-tree",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-timer 3.0.2",
  "log",
  "merlin",
@@ -6267,7 +6268,7 @@ version = "0.8.0"
 source = "git+https://github.com/darwinia-network/substrate.git?branch=common-library#7314a78d49d0dc3862c6ef7c8115cb1b3d0c0fd2"
 dependencies = [
  "derive_more",
- "futures 0.3.6",
+ "futures 0.3.7",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -6303,7 +6304,7 @@ name = "sc-consensus-slots"
 version = "0.8.0"
 source = "git+https://github.com/darwinia-network/substrate.git?branch=common-library#7314a78d49d0dc3862c6ef7c8115cb1b3d0c0fd2"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -6421,7 +6422,7 @@ dependencies = [
  "derive_more",
  "finality-grandpa",
  "fork-tree",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -6457,7 +6458,7 @@ source = "git+https://github.com/darwinia-network/substrate.git?branch=common-li
 dependencies = [
  "derive_more",
  "finality-grandpa",
- "futures 0.3.6",
+ "futures 0.3.7",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -6480,7 +6481,7 @@ version = "0.8.0"
 source = "git+https://github.com/darwinia-network/substrate.git?branch=common-library#7314a78d49d0dc3862c6ef7c8115cb1b3d0c0fd2"
 dependencies = [
  "ansi_term 0.12.1",
- "futures 0.3.6",
+ "futures 0.3.7",
  "log",
  "parity-util-mem",
  "sc-client-api",
@@ -6542,7 +6543,7 @@ dependencies = [
  "erased-serde",
  "fnv",
  "fork-tree",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-timer 3.0.2",
  "futures_codec",
  "hex",
@@ -6586,7 +6587,7 @@ name = "sc-network-gossip"
 version = "0.8.0"
 source = "git+https://github.com/darwinia-network/substrate.git?branch=common-library#7314a78d49d0dc3862c6ef7c8115cb1b3d0c0fd2"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -6603,7 +6604,7 @@ source = "git+https://github.com/darwinia-network/substrate.git?branch=common-li
 dependencies = [
  "bytes 0.5.6",
  "fnv",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-timer 3.0.2",
  "hyper 0.13.8",
  "hyper-rustls",
@@ -6628,7 +6629,7 @@ name = "sc-peerset"
 version = "2.0.0"
 source = "git+https://github.com/darwinia-network/substrate.git?branch=common-library#7314a78d49d0dc3862c6ef7c8115cb1b3d0c0fd2"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "libp2p",
  "log",
  "serde_json",
@@ -6650,7 +6651,7 @@ name = "sc-rpc"
 version = "2.0.0"
 source = "git+https://github.com/darwinia-network/substrate.git?branch=common-library#7314a78d49d0dc3862c6ef7c8115cb1b3d0c0fd2"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "hash-db",
  "jsonrpc-core",
  "jsonrpc-pubsub",
@@ -6683,7 +6684,7 @@ version = "0.8.0"
 source = "git+https://github.com/darwinia-network/substrate.git?branch=common-library#7314a78d49d0dc3862c6ef7c8115cb1b3d0c0fd2"
 dependencies = [
  "derive_more",
- "futures 0.3.6",
+ "futures 0.3.7",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -6728,7 +6729,7 @@ dependencies = [
  "directories",
  "exit-future",
  "futures 0.1.30",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-timer 3.0.2",
  "hash-db",
  "jsonrpc-core",
@@ -6800,7 +6801,7 @@ name = "sc-telemetry"
 version = "2.0.0"
 source = "git+https://github.com/darwinia-network/substrate.git?branch=common-library#7314a78d49d0dc3862c6ef7c8115cb1b3d0c0fd2"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -6841,7 +6842,7 @@ version = "2.0.0"
 source = "git+https://github.com/darwinia-network/substrate.git?branch=common-library#7314a78d49d0dc3862c6ef7c8115cb1b3d0c0fd2"
 dependencies = [
  "derive_more",
- "futures 0.3.6",
+ "futures 0.3.7",
  "linked-hash-map",
  "log",
  "parity-util-mem",
@@ -6862,7 +6863,7 @@ version = "2.0.0"
 source = "git+https://github.com/darwinia-network/substrate.git?branch=common-library#7314a78d49d0dc3862c6ef7c8115cb1b3d0c0fd2"
 dependencies = [
  "derive_more",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-diagnose",
  "intervalier",
  "log",
@@ -6899,7 +6900,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862"
 dependencies = [
  "arrayref",
- "arrayvec 0.5.1",
+ "arrayvec 0.5.2",
  "curve25519-dalek 2.1.0",
  "getrandom 0.1.15",
  "merlin",
@@ -7259,7 +7260,7 @@ dependencies = [
  "base64 0.12.3",
  "bytes 0.5.6",
  "flate2",
- "futures 0.3.6",
+ "futures 0.3.7",
  "httparse",
  "log",
  "rand 0.7.3",
@@ -7397,7 +7398,7 @@ version = "0.8.0"
 source = "git+https://github.com/darwinia-network/substrate.git?branch=common-library#7314a78d49d0dc3862c6ef7c8115cb1b3d0c0fd2"
 dependencies = [
  "derive_more",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -7468,7 +7469,7 @@ dependencies = [
  "derive_more",
  "dyn-clonable",
  "ed25519-dalek",
- "futures 0.3.6",
+ "futures 0.3.7",
  "hash-db",
  "hash256-std-hasher",
  "hex",
@@ -7574,7 +7575,7 @@ name = "sp-io"
 version = "2.0.0"
 source = "git+https://github.com/darwinia-network/substrate.git?branch=common-library#7314a78d49d0dc3862c6ef7c8115cb1b3d0c0fd2"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "hash-db",
  "libsecp256k1",
  "log",
@@ -7813,7 +7814,7 @@ version = "2.0.0"
 source = "git+https://github.com/darwinia-network/substrate.git?branch=common-library#7314a78d49d0dc3862c6ef7c8115cb1b3d0c0fd2"
 dependencies = [
  "derive_more",
- "futures 0.3.6",
+ "futures 0.3.7",
  "log",
  "parity-scale-codec",
  "serde",
@@ -7841,7 +7842,7 @@ name = "sp-utils"
 version = "2.0.0"
 source = "git+https://github.com/darwinia-network/substrate.git?branch=common-library#7314a78d49d0dc3862c6ef7c8115cb1b3d0c0fd2"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-core",
  "futures-timer 3.0.2",
  "lazy_static",
@@ -7990,7 +7991,7 @@ dependencies = [
  "console_error_panic_hook",
  "console_log",
  "futures 0.1.30",
- "futures 0.3.6",
+ "futures 0.3.7",
  "futures-timer 3.0.2",
  "js-sys",
  "kvdb-web",
@@ -8030,7 +8031,7 @@ version = "2.0.0"
 source = "git+https://github.com/darwinia-network/substrate.git?branch=common-library#7314a78d49d0dc3862c6ef7c8115cb1b3d0c0fd2"
 dependencies = [
  "frame-system-rpc-runtime-api",
- "futures 0.3.6",
+ "futures 0.3.7",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -8080,9 +8081,9 @@ checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd"
 
 [[package]]
 name = "syn"
-version = "1.0.46"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ad5de3220ea04da322618ded2c42233d02baca219d6f160a3e9c87cda16c942"
+checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8578,6 +8579,16 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "tracing-futures"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c"
+dependencies = [
+ "pin-project 0.4.27",
+ "tracing",
+]
+
 [[package]]
 name = "tracing-log"
 version = "0.1.1"
@@ -8950,7 +8961,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "js-sys",
  "parking_lot 0.11.0",
  "pin-utils",
@@ -9304,7 +9315,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9aeb8c4043cac71c3c299dff107171c220d179492350ea198e109a414981b83c"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "log",
  "nohash-hasher",
  "parking_lot 0.11.0",
diff --git a/Cargo.toml b/Cargo.toml
index 4dbf4ecea..0ca38aeee 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ homepage    = "https://darwinia.network/"
 license     = "GPL-3.0"
 name        = "darwinia"
 repository  = "https://github.com/darwinia-network/darwinia/"
-version     = "0.7.3"
+version     = "0.7.4"
 
 [[bin]]
 name = "darwinia"
@@ -17,7 +17,7 @@ maintenance = { status = "actively-developed" }
 
 [dependencies]
 # crates
-futures         = { version = "0.3.6" }
+futures         = { version = "0.3.7" }
 parity-util-mem = { version = "*", default-features = false, features = ["jemalloc-global"] }
 # darwinia
 darwinia-cli     = { path = "cli" }
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 5f52a4f36..53e2f4d88 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -7,7 +7,7 @@ homepage    = "https://darwinia.network/"
 license     = "GPL-3.0"
 name        = "darwinia-cli"
 repository  = "https://github.com/darwinia-network/darwinia/"
-version     = "0.7.3"
+version     = "0.7.4"
 
 [package.metadata.wasm-pack.profile.release]
 # `wasm-opt` has some problems on linux, see
diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml
index eb0b1049a..a29cb4ef3 100644
--- a/node/service/Cargo.toml
+++ b/node/service/Cargo.toml
@@ -6,12 +6,12 @@ homepage    = "https://darwinia.network/"
 license     = "GPL-3.0"
 name        = "darwinia-service"
 repository  = "https://github.com/darwinia-network/darwinia/"
-version     = "0.7.3"
+version     = "0.7.4"
 
 [dependencies]
 # crates
 codec      = { package = "parity-scale-codec", version = "1.3.5", features = ["derive"] }
-futures    = { version = "0.3.6" }
+futures    = { version = "0.3.7" }
 log        = { version = "0.4.11" }
 serde      = { version = "1.0.117", features = ["derive"] }
 serde_json = { version = "1.0.59" }
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index 8ad6bab6f..3c6e8da31 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -6,7 +6,7 @@ homepage    = "https://darwinia.network/"
 license     = "GPL-3.0"
 name        = "darwinia-primitives"
 repository  = "https://github.com/darwinia-network/darwinia/"
-version     = "0.7.3"
+version     = "0.7.4"
 
 [dependencies]
 # crates
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 66366e481..26ef62af3 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -6,7 +6,7 @@ homepage    = "https://darwinia.network/"
 license     = "GPL-3.0"
 name        = "darwinia-rpc"
 repository  = "https://github.com/darwinia-network/darwinia/"
-version     = "0.7.3"
+version     = "0.7.4"
 
 [dependencies]
 # crates
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
index 4e266785a..7b57947de 100644
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -6,7 +6,7 @@ homepage    = "https://darwinia.network/"
 license     = "GPL-3.0"
 name        = "darwinia-runtime-common"
 repository  = "https://github.com/darwinia-network/darwinia/"
-version     = "0.7.3"
+version     = "0.7.4"
 
 [dependencies]
 # crates
diff --git a/runtime/crab/Cargo.toml b/runtime/crab/Cargo.toml
index 4cb6c84cb..2095021cf 100644
--- a/runtime/crab/Cargo.toml
+++ b/runtime/crab/Cargo.toml
@@ -7,7 +7,7 @@ homepage    = "https://darwinia.network/"
 license     = "GPL-3.0"
 name        = "crab-runtime"
 repository  = "https://github.com/darwinia-network/darwinia/"
-version     = "0.7.3"
+version     = "0.7.4"
 
 [dependencies]
 # crates
diff --git a/runtime/crab/polkadot-compatible-types.json b/runtime/crab/polkadot-compatible-types.json
index 3f49e60f8..dbefacdbd 100644
--- a/runtime/crab/polkadot-compatible-types.json
+++ b/runtime/crab/polkadot-compatible-types.json
@@ -203,30 +203,34 @@
 		"mmr_root": "Hash"
 	},
 	"__[pallet.relayer-game]__": {},
-	"RelayHeaderId": "Vec<u8>",
-	"RelayHeaderParcel": "Vec<u8>",
-	"RelayProofs": "Vec<u8>",
+	"RelayHeaderId": "EthereumBlockNumber",
+	"RelayHeaderParcel": "EthereumRelayHeaderParcel",
+	"RelayProofs": "EthereumRelayProof",
 	"RelayAffirmationId": {
-		"relay_header_id": "Vec<u8>",
+		"game_id": "EthereumBlockNumber",
 		"round": "u32",
 		"index": "u32"
 	},
 	"RelayAffirmationT": {
 		"relayer": "AccountId",
-		"relay_header_parcels": "Vec<u8>",
+		"relay_header_parcels": "EthereumRelayHeaderParcel",
 		"bond": "Balance",
-		"maybe_extended_relay_affirmation_id": "Option<Vec<u8>>",
+		"maybe_extended_relay_affirmation_id": "Option<RelayAffirmationId>",
 		"verified": "bool"
 	},
-	"__[crab.runtime]__": {
-		"ProxyType": {
-			"_enum": {
-				"Any": null,
-				"NonTransfer": null,
-				"Staking": null,
-				"IdentityJudgement": null,
-				"EthereumBridge": null
-			}
+	"RelayVotingState": {
+		"ayes": "Vec<AccountId>",
+		"nays": "Vec<AccountId>"
+	},
+	"__[crab.runtime]__": {},
+	"ProxyType": {
+		"_enum": {
+			"Any": null,
+			"NonTransfer": null,
+			"Governance": null,
+			"Staking": null,
+			"IdentityJudgement": null,
+			"EthereumBridge": null
 		}
 	},
 	"__[node.rpc]__": {},
diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs
index 4d520c8cf..02068f24b 100644
--- a/runtime/crab/src/lib.rs
+++ b/runtime/crab/src/lib.rs
@@ -51,7 +51,8 @@ use static_assertions::const_assert;
 use frame_support::{
 	construct_runtime, debug, parameter_types,
 	traits::{
-		Imbalance, InstanceFilter, KeyOwnerProofSystem, LockIdentifier, OnUnbalanced, Randomness,
+		ChangeMembers, Imbalance, InstanceFilter, KeyOwnerProofSystem, LockIdentifier,
+		OnUnbalanced, Randomness,
 	},
 	weights::Weight,
 };
@@ -111,7 +112,7 @@ pub type SignedExtra = (
 	frame_system::CheckNonce<Runtime>,
 	frame_system::CheckWeight<Runtime>,
 	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
-	darwinia_ethereum_relay::CheckEthereumRelayHeaderHash<Runtime>,
+	darwinia_ethereum_relay::CheckEthereumRelayHeaderParcel<Runtime>,
 );
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;
@@ -124,7 +125,7 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllModules,
-	CustomOnRuntimeUpgrade,
+	// CustomOnRuntimeUpgrade,
 >;
 /// The payload being signed in transactions.
 pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
@@ -136,7 +137,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("Crab"),
 	impl_name: create_runtime_str!("Darwinia Crab"),
 	authoring_version: 0,
-	spec_version: 23,
+	spec_version: 24,
 	impl_version: 0,
 	#[cfg(not(feature = "disable-runtime-api"))]
 	apis: RUNTIME_API_VERSIONS,
@@ -553,6 +554,17 @@ impl darwinia_elections_phragmen::Trait for Runtime {
 	type WeightInfo = weights::darwinia_elections_phragmen::WeightInfo<Runtime>;
 }
 
+pub struct MembershipChangedGroup;
+impl ChangeMembers<AccountId> for MembershipChangedGroup {
+	fn change_members_sorted(
+		incoming: &[AccountId],
+		outgoing: &[AccountId],
+		sorted_new: &[AccountId],
+	) {
+		TechnicalCommittee::change_members_sorted(incoming, outgoing, sorted_new);
+		EthereumRelay::change_members_sorted(incoming, outgoing, sorted_new);
+	}
+}
 type EnsureRootOrMoreThanHalfCouncil = EnsureOneOf<
 	AccountId,
 	EnsureRoot<AccountId>,
@@ -566,7 +578,7 @@ impl pallet_membership::Trait<pallet_membership::Instance0> for Runtime {
 	type ResetOrigin = EnsureRootOrMoreThanHalfCouncil;
 	type PrimeOrigin = EnsureRootOrMoreThanHalfCouncil;
 	type MembershipInitialized = TechnicalCommittee;
-	type MembershipChanged = TechnicalCommittee;
+	type MembershipChanged = MembershipChangedGroup;
 }
 
 type ApproveOrigin = EnsureOneOf<
@@ -777,11 +789,9 @@ impl InstanceFilter<Call> for ProxyType {
 				Call::Scheduler(..) |
 				Call::Proxy(..) |
 				Call::Multisig(..) |
-				Call::EthereumBacking(..) |
+				// Specifically omitting the entire EthereumBacking pallet
 				Call::EthereumRelay(..) |
-				Call::EthereumRelayerGame(..) |
-				Call::HeaderMMR(..) |
-				Call::CrabIssuing(..)
+				Call::HeaderMMR(..) // Specifically omitting the entire CrabIssuing pallet
 			),
 			ProxyType::Governance => matches!(
 				c,
@@ -885,6 +895,9 @@ type EnsureRootOrHalfTechnicalComittee = EnsureOneOf<
 parameter_types! {
 	pub const EthereumRelayModuleId: ModuleId = ModuleId(*b"da/ethrl");
 	pub const EthereumNetwork: EthereumNetworkType = EthereumNetworkType::Ropsten;
+	pub const ConfirmPeriod: BlockNumber = 200;
+	pub const ApproveThreshold: Perbill = Perbill::from_percent(60);
+	pub const RejectThreshold: Perbill = Perbill::from_percent(1);
 }
 impl darwinia_ethereum_relay::Trait for Runtime {
 	type ModuleId = EthereumRelayModuleId;
@@ -895,21 +908,19 @@ impl darwinia_ethereum_relay::Trait for Runtime {
 	type RelayerGame = EthereumRelayerGame;
 	type ApproveOrigin = TechnicalCommitteeApproveOrigin;
 	type RejectOrigin = EnsureRootOrHalfTechnicalComittee;
+	type ConfirmPeriod = ConfirmPeriod;
+	type TechnicalMembership = TechnicalMembership;
+	type ApproveThreshold = ApproveThreshold;
+	type RejectThreshold = RejectThreshold;
 	type WeightInfo = ();
 }
 
 type EthereumRelayerGameInstance = darwinia_relayer_game::Instance0;
-parameter_types! {
-	pub const ConfirmPeriod: BlockNumber = 200;
-}
 impl darwinia_relayer_game::Trait<EthereumRelayerGameInstance> for Runtime {
-	type Call = Call;
-	type Event = Event;
 	type RingCurrency = Ring;
 	type RingSlash = Treasury;
 	type RelayerGameAdjustor = EthereumRelayerGameAdjustor;
 	type RelayableChain = EthereumRelay;
-	type ConfirmPeriod = ConfirmPeriod;
 	type WeightInfo = ();
 }
 
@@ -990,7 +1001,7 @@ construct_runtime!(
 
 		EthereumBacking: darwinia_ethereum_backing::{Module, Call, Storage, Config<T>, Event<T>},
 		EthereumRelay: darwinia_ethereum_relay::{Module, Call, Storage, Config<T>, Event<T>},
-		EthereumRelayerGame: darwinia_relayer_game::<Instance0>::{Module, Call, Storage, Event<T>},
+		EthereumRelayerGame: darwinia_relayer_game::<Instance0>::{Module, Storage},
 
 		// Consensus support.
 		HeaderMMR: darwinia_header_mmr::{Module, Call, Storage},
@@ -1037,7 +1048,7 @@ where
 			frame_system::CheckNonce::<Runtime>::from(nonce),
 			frame_system::CheckWeight::<Runtime>::new(),
 			pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(tip),
-			darwinia_ethereum_relay::CheckEthereumRelayHeaderHash::<Runtime>::new(),
+			darwinia_ethereum_relay::CheckEthereumRelayHeaderParcel::<Runtime>::new(),
 		);
 		let raw_payload = SignedPayload::new(call, extra)
 			.map_err(|e| {
@@ -1259,11 +1270,9 @@ impl_runtime_apis! {
 	}
 }
 
-pub struct CustomOnRuntimeUpgrade;
-impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
-	fn on_runtime_upgrade() -> frame_support::weights::Weight {
-		<darwinia_ethereum_relay::Module<Runtime>>::migrate_genesis(false);
-
-		<Runtime as frame_system::Trait>::MaximumBlockWeight::get()
-	}
-}
+// pub struct CustomOnRuntimeUpgrade;
+// impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
+// 	fn on_runtime_upgrade() -> frame_support::weights::Weight {
+// 		<Runtime as frame_system::Trait>::MaximumBlockWeight::get()
+// 	}
+// }
diff --git a/runtime/crab/types.json b/runtime/crab/types.json
index a42beb0a6..149af120a 100644
--- a/runtime/crab/types.json
+++ b/runtime/crab/types.json
@@ -195,30 +195,34 @@
 		"mmr_root": "Hash"
 	},
 	"__[pallet.relayer-game]__": {},
-	"RelayHeaderId": "Vec<u8>",
-	"RelayHeaderParcel": "Vec<u8>",
-	"RelayProofs": "Vec<u8>",
+	"RelayHeaderId": "EthereumBlockNumber",
+	"RelayHeaderParcel": "EthereumRelayHeaderParcel",
+	"RelayProofs": "EthereumRelayProof",
 	"RelayAffirmationId": {
-		"relay_header_id": "Vec<u8>",
+		"game_id": "EthereumBlockNumber",
 		"round": "u32",
 		"index": "u32"
 	},
 	"RelayAffirmationT": {
 		"relayer": "AccountId",
-		"relay_header_parcels": "Vec<u8>",
+		"relay_header_parcels": "EthereumRelayHeaderParcel",
 		"bond": "Balance",
-		"maybe_extended_relay_affirmation_id": "Option<Vec<u8>>",
+		"maybe_extended_relay_affirmation_id": "Option<RelayAffirmationId>",
 		"verified": "bool"
 	},
-	"__[crab.runtime]__": {
-		"ProxyType": {
-			"_enum": {
-				"Any": null,
-				"NonTransfer": null,
-				"Staking": null,
-				"IdentityJudgement": null,
-				"EthereumBridge": null
-			}
+	"RelayVotingState": {
+		"ayes": "Vec<AccountId>",
+		"nays": "Vec<AccountId>"
+	},
+	"__[crab.runtime]__": {},
+	"ProxyType": {
+		"_enum": {
+			"Any": null,
+			"NonTransfer": null,
+			"Governance": null,
+			"Staking": null,
+			"IdentityJudgement": null,
+			"EthereumBridge": null
 		}
 	},
 	"__[node.rpc]__": {},
diff --git a/runtime/darwinia/Cargo.toml b/runtime/darwinia/Cargo.toml
index 5af6838e0..0314915c6 100644
--- a/runtime/darwinia/Cargo.toml
+++ b/runtime/darwinia/Cargo.toml
@@ -7,7 +7,7 @@ homepage    = "https://darwinia.network/"
 license     = "GPL-3.0"
 name        = "darwinia-runtime"
 repository  = "https://github.com/darwinia-network/darwinia/"
-version     = "0.7.3"
+version     = "0.7.4"
 
 [dependencies]
 # crates
diff --git a/runtime/darwinia/polkadot-compatible-types.json b/runtime/darwinia/polkadot-compatible-types.json
index 3f49e60f8..0eeb7f554 100644
--- a/runtime/darwinia/polkadot-compatible-types.json
+++ b/runtime/darwinia/polkadot-compatible-types.json
@@ -203,30 +203,34 @@
 		"mmr_root": "Hash"
 	},
 	"__[pallet.relayer-game]__": {},
-	"RelayHeaderId": "Vec<u8>",
-	"RelayHeaderParcel": "Vec<u8>",
-	"RelayProofs": "Vec<u8>",
+	"RelayHeaderId": "EthereumBlockNumber",
+	"RelayHeaderParcel": "EthereumRelayHeaderParcel",
+	"RelayProofs": "EthereumRelayProof",
 	"RelayAffirmationId": {
-		"relay_header_id": "Vec<u8>",
+		"game_id": "EthereumBlockNumber",
 		"round": "u32",
 		"index": "u32"
 	},
 	"RelayAffirmationT": {
 		"relayer": "AccountId",
-		"relay_header_parcels": "Vec<u8>",
+		"relay_header_parcels": "EthereumRelayHeaderParcel",
 		"bond": "Balance",
-		"maybe_extended_relay_affirmation_id": "Option<Vec<u8>>",
+		"maybe_extended_relay_affirmation_id": "Option<RelayAffirmationId>",
 		"verified": "bool"
 	},
-	"__[crab.runtime]__": {
-		"ProxyType": {
-			"_enum": {
-				"Any": null,
-				"NonTransfer": null,
-				"Staking": null,
-				"IdentityJudgement": null,
-				"EthereumBridge": null
-			}
+	"RelayVotingState": {
+		"ayes": "Vec<AccountId>",
+		"nays": "Vec<AccountId>"
+	},
+	"__[darwinia.runtime]__": {},
+	"ProxyType": {
+		"_enum": {
+			"Any": null,
+			"NonTransfer": null,
+			"Staking": null,
+			"IdentityJudgement": null,
+			"EthereumBridge": null,
+			"Governance": null
 		}
 	},
 	"__[node.rpc]__": {},
diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs
index 5e6c31336..ca4c8b3ac 100644
--- a/runtime/darwinia/src/lib.rs
+++ b/runtime/darwinia/src/lib.rs
@@ -86,8 +86,8 @@ use static_assertions::const_assert;
 use frame_support::{
 	construct_runtime, debug, parameter_types,
 	traits::{
-		Filter, Imbalance, InstanceFilter, KeyOwnerProofSystem, LockIdentifier, OnUnbalanced,
-		Randomness,
+		ChangeMembers, Filter, Imbalance, InstanceFilter, KeyOwnerProofSystem, LockIdentifier,
+		OnUnbalanced, Randomness,
 	},
 	weights::Weight,
 };
@@ -147,7 +147,7 @@ pub type SignedExtra = (
 	frame_system::CheckNonce<Runtime>,
 	frame_system::CheckWeight<Runtime>,
 	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
-	darwinia_ethereum_relay::CheckEthereumRelayHeaderHash<Runtime>,
+	darwinia_ethereum_relay::CheckEthereumRelayHeaderParcel<Runtime>,
 );
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;
@@ -160,7 +160,7 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllModules,
-	CustomOnRuntimeUpgrade,
+	// CustomOnRuntimeUpgrade,
 >;
 /// The payload being signed in transactions.
 pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
@@ -172,7 +172,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("Darwinia"),
 	impl_name: create_runtime_str!("Darwinia"),
 	authoring_version: 0,
-	spec_version: 4,
+	spec_version: 5,
 	impl_version: 0,
 	#[cfg(not(feature = "disable-runtime-api"))]
 	apis: RUNTIME_API_VERSIONS,
@@ -195,7 +195,7 @@ impl Filter<Call> for BaseFilter {
 	fn filter(c: &Call) -> bool {
 		match c {
 			// first stage
-			Call::EthereumRelay(_) | Call::EthereumRelayerGame(_) => false,
+			Call::EthereumRelay(_) => false,
 			// second stage
 			Call::Balances(_)
 			| Call::Kton(_)
@@ -526,6 +526,17 @@ impl darwinia_elections_phragmen::Trait for Runtime {
 	type WeightInfo = weights::darwinia_elections_phragmen::WeightInfo<Runtime>;
 }
 
+pub struct MembershipChangedGroup;
+impl ChangeMembers<AccountId> for MembershipChangedGroup {
+	fn change_members_sorted(
+		incoming: &[AccountId],
+		outgoing: &[AccountId],
+		sorted_new: &[AccountId],
+	) {
+		TechnicalCommittee::change_members_sorted(incoming, outgoing, sorted_new);
+		EthereumRelay::change_members_sorted(incoming, outgoing, sorted_new);
+	}
+}
 type EnsureRootOrHalfCouncil = EnsureOneOf<
 	AccountId,
 	EnsureRoot<AccountId>,
@@ -539,7 +550,7 @@ impl pallet_membership::Trait<pallet_membership::Instance0> for Runtime {
 	type ResetOrigin = EnsureRootOrHalfCouncil;
 	type PrimeOrigin = EnsureRootOrHalfCouncil;
 	type MembershipInitialized = TechnicalCommittee;
-	type MembershipChanged = TechnicalCommittee;
+	type MembershipChanged = MembershipChangedGroup;
 }
 
 type ApproveOrigin = EnsureOneOf<
@@ -701,6 +712,7 @@ pub enum ProxyType {
 	Staking,
 	IdentityJudgement,
 	EthereumBridge,
+	Governance,
 }
 impl Default for ProxyType {
 	fn default() -> Self {
@@ -745,9 +757,10 @@ impl InstanceFilter<Call> for ProxyType {
 				Call::Scheduler(..) |
 				Call::Proxy(..) |
 				Call::Multisig(..) |
-				Call::EthereumBacking(..) |
+				// Specifically omitting the entire CrabBacking pallet
+				// Specifically omitting the entire EthereumBacking pallet
 				Call::EthereumRelay(..) |
-				Call::EthereumRelayerGame(..) |
+				// Specifically omitting the entire TronBacking pallet
 				Call::HeaderMMR(..)
 			),
 			ProxyType::Staking => matches!(c, Call::Staking(..) | Call::Utility(..)),
@@ -759,6 +772,13 @@ impl InstanceFilter<Call> for ProxyType {
 			ProxyType::EthereumBridge => {
 				matches!(c, Call::EthereumBacking(..) | Call::EthereumRelay(..))
 			}
+			ProxyType::Governance => matches!(
+				c,
+				Call::Council(..)
+					| Call::TechnicalCommittee(..)
+					| Call::ElectionsPhragmen(..)
+					| Call::Treasury(..) | Call::Utility(..)
+			),
 		}
 	}
 	fn is_superset(&self, o: &Self) -> bool {
@@ -845,6 +865,9 @@ type EnsureRootOrHalfTechnicalComittee = EnsureOneOf<
 parameter_types! {
 	pub const EthereumRelayModuleId: ModuleId = ModuleId(*b"da/ethrl");
 	pub const EthereumNetwork: EthereumNetworkType = EthereumNetworkType::Mainnet;
+	pub const ConfirmPeriod: BlockNumber = 3 * DAYS;
+	pub const ApproveThreshold: Perbill = Perbill::from_percent(60);
+	pub const RejectThreshold: Perbill = Perbill::from_percent(1);
 }
 impl darwinia_ethereum_relay::Trait for Runtime {
 	type ModuleId = EthereumRelayModuleId;
@@ -855,21 +878,19 @@ impl darwinia_ethereum_relay::Trait for Runtime {
 	type RelayerGame = EthereumRelayerGame;
 	type ApproveOrigin = TechnicalCommitteeApproveOrigin;
 	type RejectOrigin = EnsureRootOrHalfTechnicalComittee;
+	type ConfirmPeriod = ConfirmPeriod;
+	type TechnicalMembership = TechnicalMembership;
+	type ApproveThreshold = ApproveThreshold;
+	type RejectThreshold = RejectThreshold;
 	type WeightInfo = ();
 }
 
 type EthereumRelayerGameInstance = darwinia_relayer_game::Instance0;
-parameter_types! {
-	pub const ConfirmPeriod: BlockNumber = 3 * DAYS;
-}
 impl darwinia_relayer_game::Trait<EthereumRelayerGameInstance> for Runtime {
-	type Call = Call;
-	type Event = Event;
 	type RingCurrency = Ring;
 	type RingSlash = Treasury;
 	type RelayerGameAdjustor = EthereumRelayerGameAdjustor;
 	type RelayableChain = EthereumRelay;
-	type ConfirmPeriod = ConfirmPeriod;
 	type WeightInfo = ();
 }
 
@@ -963,7 +984,7 @@ construct_runtime!(
 		// Ethereum bridge.
 		EthereumBacking: darwinia_ethereum_backing::{Module, Call, Storage, Config<T>, Event<T>},
 		EthereumRelay: darwinia_ethereum_relay::{Module, Call, Storage, Config<T>, Event<T>},
-		EthereumRelayerGame: darwinia_relayer_game::<Instance0>::{Module, Call, Storage, Event<T>},
+		EthereumRelayerGame: darwinia_relayer_game::<Instance0>::{Module, Storage},
 
 		// Tron bridge.
 		TronBacking: darwinia_tron_backing::{Module, Storage, Config<T>},
@@ -1000,7 +1021,7 @@ where
 			frame_system::CheckNonce::<Runtime>::from(nonce),
 			frame_system::CheckWeight::<Runtime>::new(),
 			pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(tip),
-			darwinia_ethereum_relay::CheckEthereumRelayHeaderHash::<Runtime>::new(),
+			darwinia_ethereum_relay::CheckEthereumRelayHeaderParcel::<Runtime>::new(),
 		);
 		let raw_payload = SignedPayload::new(call, extra)
 			.map_err(|e| {
@@ -1222,11 +1243,9 @@ impl_runtime_apis! {
 	}
 }
 
-pub struct CustomOnRuntimeUpgrade;
-impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
-	fn on_runtime_upgrade() -> frame_support::weights::Weight {
-		<darwinia_ethereum_relay::Module<Runtime>>::migrate_genesis(false);
-
-		<Runtime as frame_system::Trait>::MaximumBlockWeight::get()
-	}
-}
+// pub struct CustomOnRuntimeUpgrade;
+// impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
+// 	fn on_runtime_upgrade() -> frame_support::weights::Weight {
+// 		<Runtime as frame_system::Trait>::MaximumBlockWeight::get()
+// 	}
+// }
diff --git a/runtime/darwinia/types.json b/runtime/darwinia/types.json
index a42beb0a6..dd21d2712 100644
--- a/runtime/darwinia/types.json
+++ b/runtime/darwinia/types.json
@@ -195,30 +195,34 @@
 		"mmr_root": "Hash"
 	},
 	"__[pallet.relayer-game]__": {},
-	"RelayHeaderId": "Vec<u8>",
-	"RelayHeaderParcel": "Vec<u8>",
-	"RelayProofs": "Vec<u8>",
+	"RelayHeaderId": "EthereumBlockNumber",
+	"RelayHeaderParcel": "EthereumRelayHeaderParcel",
+	"RelayProofs": "EthereumRelayProof",
 	"RelayAffirmationId": {
-		"relay_header_id": "Vec<u8>",
+		"game_id": "EthereumBlockNumber",
 		"round": "u32",
 		"index": "u32"
 	},
 	"RelayAffirmationT": {
 		"relayer": "AccountId",
-		"relay_header_parcels": "Vec<u8>",
+		"relay_header_parcels": "EthereumRelayHeaderParcel",
 		"bond": "Balance",
-		"maybe_extended_relay_affirmation_id": "Option<Vec<u8>>",
+		"maybe_extended_relay_affirmation_id": "Option<RelayAffirmationId>",
 		"verified": "bool"
 	},
-	"__[crab.runtime]__": {
-		"ProxyType": {
-			"_enum": {
-				"Any": null,
-				"NonTransfer": null,
-				"Staking": null,
-				"IdentityJudgement": null,
-				"EthereumBridge": null
-			}
+	"RelayVotingState": {
+		"ayes": "Vec<AccountId>",
+		"nays": "Vec<AccountId>"
+	},
+	"__[darwinia.runtime]__": {},
+	"ProxyType": {
+		"_enum": {
+			"Any": null,
+			"NonTransfer": null,
+			"Staking": null,
+			"IdentityJudgement": null,
+			"EthereumBridge": null,
+			"Governance": null
 		}
 	},
 	"__[node.rpc]__": {},