diff --git a/Cargo.lock b/Cargo.lock
index 033b9c92e9..da9c53a248 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1687,7 +1687,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1765,7 +1765,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1787,7 +1787,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "Inflector",
  "chrono",
@@ -1828,7 +1828,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1856,7 +1856,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -1885,7 +1885,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -1897,7 +1897,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 1.1.3",
@@ -1909,7 +1909,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1919,7 +1919,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "frame-support",
  "log",
@@ -1936,7 +1936,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1951,7 +1951,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -4239,7 +4239,7 @@ dependencies = [
 [[package]]
 name = "pallet-aura"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4255,7 +4255,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4270,7 +4270,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4457,7 +4457,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4480,7 +4480,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4494,7 +4494,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4515,7 +4515,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4529,7 +4529,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4546,7 +4546,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4563,7 +4563,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4580,7 +4580,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -5588,7 +5588,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.1.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "log",
  "sp-core",
@@ -5599,7 +5599,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -5622,7 +5622,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -5638,7 +5638,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "impl-trait-for-tuples",
  "memmap2 0.5.3",
@@ -5655,7 +5655,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "proc-macro-crate 1.1.3",
  "proc-macro2",
@@ -5666,7 +5666,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "chrono",
  "clap",
@@ -5704,7 +5704,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "fnv",
  "futures 0.3.21",
@@ -5732,7 +5732,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -5757,7 +5757,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -5781,7 +5781,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -5810,7 +5810,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -5853,7 +5853,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -5866,7 +5866,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-manual-seal"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -5902,7 +5902,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -5927,7 +5927,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "lazy_static",
  "lru 0.6.6",
@@ -5954,7 +5954,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -5971,7 +5971,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -5987,7 +5987,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -6005,7 +6005,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "ahash",
  "async-trait",
@@ -6045,7 +6045,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "ansi_term",
  "futures 0.3.21",
@@ -6062,7 +6062,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "async-trait",
  "hex",
@@ -6077,7 +6077,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "async-trait",
  "asynchronous-codec 0.5.0",
@@ -6126,7 +6126,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "ahash",
  "futures 0.3.21",
@@ -6143,7 +6143,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "bytes 1.1.0",
  "fnv",
@@ -6171,7 +6171,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "futures 0.3.21",
  "libp2p",
@@ -6184,7 +6184,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -6193,7 +6193,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "futures 0.3.21",
  "hash-db",
@@ -6224,7 +6224,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "futures 0.3.21",
  "jsonrpc-core",
@@ -6249,7 +6249,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "futures 0.3.21",
  "jsonrpc-core",
@@ -6266,7 +6266,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "async-trait",
  "directories",
@@ -6330,7 +6330,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -6344,7 +6344,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "chrono",
  "futures 0.3.21",
@@ -6362,7 +6362,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "ansi_term",
  "atty",
@@ -6393,7 +6393,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "proc-macro-crate 1.1.3",
  "proc-macro2",
@@ -6404,7 +6404,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -6431,7 +6431,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "futures 0.3.21",
  "log",
@@ -6444,7 +6444,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -6885,7 +6885,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "hash-db",
  "log",
@@ -6902,7 +6902,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "blake2 0.10.4",
  "proc-macro-crate 1.1.3",
@@ -6914,7 +6914,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "6.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -6927,7 +6927,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "5.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -6942,7 +6942,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -6954,7 +6954,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6966,7 +6966,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "futures 0.3.21",
  "log",
@@ -6984,7 +6984,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -7003,7 +7003,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -7021,7 +7021,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "async-trait",
  "merlin",
@@ -7044,7 +7044,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -7058,7 +7058,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -7070,7 +7070,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "6.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "base58",
  "bitflags",
@@ -7116,7 +7116,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing"
 version = "4.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "blake2 0.10.4",
  "byteorder",
@@ -7130,7 +7130,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7141,7 +7141,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.0",
@@ -7150,7 +7150,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "4.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7160,7 +7160,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.12.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -7171,7 +7171,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -7189,7 +7189,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -7203,7 +7203,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "6.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "futures 0.3.21",
  "hash-db",
@@ -7228,7 +7228,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "6.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -7239,7 +7239,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.12.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -7256,7 +7256,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "thiserror",
  "zstd",
@@ -7265,7 +7265,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -7275,7 +7275,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "4.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -7285,7 +7285,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "6.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -7295,7 +7295,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "6.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -7317,7 +7317,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "6.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7334,7 +7334,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.1.3",
@@ -7346,7 +7346,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "serde",
  "serde_json",
@@ -7355,7 +7355,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -7369,7 +7369,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -7380,7 +7380,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.12.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "hash-db",
  "log",
@@ -7403,12 +7403,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "4.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 
 [[package]]
 name = "sp-storage"
 version = "6.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -7421,7 +7421,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "log",
  "sp-core",
@@ -7434,7 +7434,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "async-trait",
  "futures-timer",
@@ -7450,7 +7450,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "5.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -7462,7 +7462,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -7471,7 +7471,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "async-trait",
  "log",
@@ -7487,7 +7487,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "6.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -7503,7 +7503,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "5.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -7520,7 +7520,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -7531,7 +7531,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "6.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "impl-trait-for-tuples",
  "log",
@@ -7644,7 +7644,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "platforms",
 ]
@@ -7652,7 +7652,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.21",
@@ -7674,7 +7674,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "futures-util",
  "hyper",
@@ -7687,7 +7687,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix#a442f6cbc4e2195c1590dc490d6fe49004ee219f"
+source = "git+https://github.com/chainx-org/substrate?branch=polkadot-v0.9.18-fix2#235ff4fecb9196283b82c407d67627d02072a562"
 dependencies = [
  "ansi_term",
  "build-helper",
diff --git a/frame/ethereum/src/lib.rs b/frame/ethereum/src/lib.rs
index f8e55e83da..6a4b712118 100644
--- a/frame/ethereum/src/lib.rs
+++ b/frame/ethereum/src/lib.rs
@@ -40,14 +40,14 @@ use frame_support::{
 	dispatch::DispatchResultWithPostInfo,
 	scale_info::TypeInfo,
 	traits::{EnsureOrigin, Get, PalletInfoAccess},
-	weights::{Pays, PostDispatchInfo, Weight},
+	weights::{DispatchInfo, Pays, PostDispatchInfo, Weight},
 };
-use frame_system::{pallet_prelude::OriginFor, WeightInfo};
+use frame_system::{pallet_prelude::OriginFor, CheckWeight, WeightInfo};
 use pallet_evm::{BlockHashMapping, FeeCalculator, GasWeightMapping, Runner};
 use sha3::{Digest, Keccak256};
 use sp_runtime::{
 	generic::DigestItem,
-	traits::{One, Saturating, UniqueSaturatedInto, Zero},
+	traits::{DispatchInfoOf, Dispatchable, One, Saturating, UniqueSaturatedInto, Zero},
 	transaction_validity::{
 		InvalidTransaction, TransactionValidity, TransactionValidityError, ValidTransactionBuilder,
 	},
@@ -110,6 +110,8 @@ impl<O: Into<Result<RawOrigin, O>> + From<RawOrigin>> EnsureOrigin<O>
 impl<T: Config> Call<T>
 where
 	OriginFor<T>: Into<Result<RawOrigin, OriginFor<T>>>,
+	T: Send + Sync + Config,
+	T::Call: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>,
 {
 	pub fn is_self_contained(&self) -> bool {
 		match self {
@@ -137,19 +139,34 @@ where
 	pub fn pre_dispatch_self_contained(
 		&self,
 		origin: &H160,
+		dispatch_info: &DispatchInfoOf<T::Call>,
+		len: usize,
 	) -> Option<Result<(), TransactionValidityError>> {
 		if let Call::transact { transaction } = self {
+			if let Err(e) = CheckWeight::<T>::do_pre_dispatch(dispatch_info, len) {
+				return Some(Err(e));
+			}
+
 			Some(Pallet::<T>::validate_transaction_in_block(
 				*origin,
-				&transaction,
+				transaction,
 			))
 		} else {
 			None
 		}
 	}
 
-	pub fn validate_self_contained(&self, origin: &H160) -> Option<TransactionValidity> {
+	pub fn validate_self_contained(
+		&self,
+		origin: &H160,
+		dispatch_info: &DispatchInfoOf<T::Call>,
+		len: usize,
+	) -> Option<TransactionValidity> {
 		if let Call::transact { transaction } = self {
+			if let Err(e) = CheckWeight::<T>::do_validate(dispatch_info, len) {
+				return Some(Err(e));
+			}
+
 			Some(Pallet::<T>::validate_transaction_in_pool(
 				*origin,
 				transaction,
diff --git a/frame/ethereum/src/mock.rs b/frame/ethereum/src/mock.rs
index 58b60b7468..0bc40237b6 100644
--- a/frame/ethereum/src/mock.rs
+++ b/frame/ethereum/src/mock.rs
@@ -193,9 +193,14 @@ impl fp_self_contained::SelfContainedCall for Call {
 		}
 	}
 
-	fn validate_self_contained(&self, info: &Self::SignedInfo) -> Option<TransactionValidity> {
+	fn validate_self_contained(
+		&self,
+		info: &Self::SignedInfo,
+		dispatch_info: &DispatchInfoOf<Call>,
+		len: usize,
+	) -> Option<TransactionValidity> {
 		match self {
-			Call::Ethereum(call) => call.validate_self_contained(info),
+			Call::Ethereum(call) => call.validate_self_contained(info, dispatch_info, len),
 			_ => None,
 		}
 	}
@@ -203,9 +208,11 @@ impl fp_self_contained::SelfContainedCall for Call {
 	fn pre_dispatch_self_contained(
 		&self,
 		info: &Self::SignedInfo,
+		dispatch_info: &DispatchInfoOf<Call>,
+		len: usize,
 	) -> Option<Result<(), TransactionValidityError>> {
 		match self {
-			Call::Ethereum(call) => call.pre_dispatch_self_contained(info),
+			Call::Ethereum(call) => call.pre_dispatch_self_contained(info, dispatch_info, len),
 			_ => None,
 		}
 	}
diff --git a/frame/ethereum/src/tests/eip1559.rs b/frame/ethereum/src/tests/eip1559.rs
index ecdc443419..313e7525f6 100644
--- a/frame/ethereum/src/tests/eip1559.rs
+++ b/frame/ethereum/src/tests/eip1559.rs
@@ -61,9 +61,14 @@ fn transaction_without_enough_gas_should_not_work() {
 
 		let call = crate::Call::<Test>::transact { transaction };
 		let source = call.check_self_contained().unwrap().unwrap();
-
+		let extrinsic = fp_self_contained::CheckedExtrinsic::<u64, crate::mock::Call, SignedExtra, _> {
+			signed: fp_self_contained::CheckedSignature::SelfContained(source),
+			function: Call::Ethereum(call.clone()),
+		};
+		let dispatch_info = extrinsic.get_dispatch_info();
 		assert_err!(
-			call.validate_self_contained(&source).unwrap(),
+			call.validate_self_contained(&source, &dispatch_info, 0)
+				.unwrap(),
 			InvalidTransaction::Payment
 		);
 	});
@@ -83,9 +88,15 @@ fn transaction_with_to_low_nonce_should_not_work() {
 			transaction: signed,
 		};
 		let source = call.check_self_contained().unwrap().unwrap();
+		let extrinsic = fp_self_contained::CheckedExtrinsic::<u64, crate::mock::Call, SignedExtra, H160> {
+			signed: fp_self_contained::CheckedSignature::SelfContained(source),
+			function: Call::Ethereum(call.clone()),
+		};
+		let dispatch_info = extrinsic.get_dispatch_info();
 
 		assert_eq!(
-			call.validate_self_contained(&source).unwrap(),
+			call.validate_self_contained(&source, &dispatch_info, 0)
+				.unwrap(),
 			ValidTransactionBuilder::default()
 				.and_provides((alice.address, U256::from(1)))
 				.priority(0u64)
@@ -105,9 +116,15 @@ fn transaction_with_to_low_nonce_should_not_work() {
 			transaction: signed2,
 		};
 		let source2 = call2.check_self_contained().unwrap().unwrap();
+		let extrinsic2 = fp_self_contained::CheckedExtrinsic::<u64, crate::mock::Call, SignedExtra, _> {
+			signed: fp_self_contained::CheckedSignature::SelfContained(source),
+			function: Call::Ethereum(call2.clone()),
+		};
 
 		assert_err!(
-			call2.validate_self_contained(&source2).unwrap(),
+			call2
+				.validate_self_contained(&source2, &extrinsic2.get_dispatch_info(), 0)
+				.unwrap(),
 			InvalidTransaction::Stale
 		);
 	});
@@ -131,7 +148,6 @@ fn transaction_with_to_hight_nonce_should_fail_in_block() {
 			signed: fp_self_contained::CheckedSignature::SelfContained(source),
 			function: Call::Ethereum(call),
 		};
-		use frame_support::weights::GetDispatchInfo as _;
 		let dispatch_info = extrinsic.get_dispatch_info();
 		assert_err!(
 			extrinsic.apply::<Test>(&dispatch_info, 0),
@@ -155,7 +171,6 @@ fn transaction_with_invalid_chain_id_should_fail_in_block() {
 			signed: fp_self_contained::CheckedSignature::SelfContained(source),
 			function: Call::Ethereum(call),
 		};
-		use frame_support::weights::GetDispatchInfo as _;
 		let dispatch_info = extrinsic.get_dispatch_info();
 		assert_err!(
 			extrinsic.apply::<Test>(&dispatch_info, 0),
@@ -337,7 +352,7 @@ fn self_contained_transaction_with_extra_gas_should_adjust_weight_with_post_disp
 			transaction: signed,
 		};
 		let source = call.check_self_contained().unwrap().unwrap();
-		let extrinsic = CheckedExtrinsic::<_, _, frame_system::CheckWeight<Test>, _> {
+		let extrinsic = fp_self_contained::CheckedExtrinsic::<_, _, frame_system::CheckWeight<Test>, _> {
 			signed: fp_self_contained::CheckedSignature::SelfContained(source),
 			function: Call::Ethereum(call),
 		};
diff --git a/frame/ethereum/src/tests/eip2930.rs b/frame/ethereum/src/tests/eip2930.rs
index 59acf118e0..84c82c7071 100644
--- a/frame/ethereum/src/tests/eip2930.rs
+++ b/frame/ethereum/src/tests/eip2930.rs
@@ -60,9 +60,15 @@ fn transaction_without_enough_gas_should_not_work() {
 
 		let call = crate::Call::<Test>::transact { transaction };
 		let source = call.check_self_contained().unwrap().unwrap();
+		let extrinsic = fp_self_contained::CheckedExtrinsic::<u64, crate::mock::Call, SignedExtra, _> {
+			signed: fp_self_contained::CheckedSignature::SelfContained(source),
+			function: Call::Ethereum(call.clone()),
+		};
+		let dispatch_info = extrinsic.get_dispatch_info();
 
 		assert_err!(
-			call.validate_self_contained(&source).unwrap(),
+			call.validate_self_contained(&source, &dispatch_info, 0)
+				.unwrap(),
 			InvalidTransaction::Payment
 		);
 	});
@@ -83,9 +89,15 @@ fn transaction_with_to_low_nonce_should_not_work() {
 			transaction: signed,
 		};
 		let source = call.check_self_contained().unwrap().unwrap();
+		let extrinsic = fp_self_contained::CheckedExtrinsic::<u64, crate::mock::Call, SignedExtra, H160> {
+			signed: fp_self_contained::CheckedSignature::SelfContained(source),
+			function: Call::Ethereum(call.clone()),
+		};
+		let dispatch_info = extrinsic.get_dispatch_info();
 
 		assert_eq!(
-			call.validate_self_contained(&source).unwrap(),
+			call.validate_self_contained(&source, &dispatch_info, 0)
+				.unwrap(),
 			ValidTransactionBuilder::default()
 				.and_provides((alice.address, U256::from(1)))
 				.priority(0u64)
@@ -105,9 +117,15 @@ fn transaction_with_to_low_nonce_should_not_work() {
 			transaction: signed2,
 		};
 		let source2 = call2.check_self_contained().unwrap().unwrap();
+		let extrinsic2 = fp_self_contained::CheckedExtrinsic::<u64, crate::mock::Call, SignedExtra, _> {
+			signed: fp_self_contained::CheckedSignature::SelfContained(source),
+			function: Call::Ethereum(call2.clone()),
+		};
 
 		assert_err!(
-			call2.validate_self_contained(&source2).unwrap(),
+			call2
+				.validate_self_contained(&source2, &extrinsic2.get_dispatch_info(), 0)
+				.unwrap(),
 			InvalidTransaction::Stale
 		);
 	});
@@ -334,7 +352,7 @@ fn self_contained_transaction_with_extra_gas_should_adjust_weight_with_post_disp
 			transaction: signed,
 		};
 		let source = call.check_self_contained().unwrap().unwrap();
-		let extrinsic = CheckedExtrinsic::<_, _, frame_system::CheckWeight<Test>, _> {
+		let extrinsic = fp_self_contained::CheckedExtrinsic::<_, _, frame_system::CheckWeight<Test>, _> {
 			signed: fp_self_contained::CheckedSignature::SelfContained(source),
 			function: Call::Ethereum(call),
 		};
diff --git a/frame/ethereum/src/tests/legacy.rs b/frame/ethereum/src/tests/legacy.rs
index 3629ea9e67..1993fe1c7f 100644
--- a/frame/ethereum/src/tests/legacy.rs
+++ b/frame/ethereum/src/tests/legacy.rs
@@ -60,9 +60,15 @@ fn transaction_without_enough_gas_should_not_work() {
 
 		let call = crate::Call::<Test>::transact { transaction };
 		let source = call.check_self_contained().unwrap().unwrap();
+		let extrinsic = fp_self_contained::CheckedExtrinsic::<u64, crate::mock::Call, SignedExtra, _> {
+			signed: fp_self_contained::CheckedSignature::SelfContained(source),
+			function: Call::Ethereum(call.clone()),
+		};
+		let dispatch_info = extrinsic.get_dispatch_info();
 
 		assert_err!(
-			call.validate_self_contained(&source).unwrap(),
+			call.validate_self_contained(&source, &dispatch_info, 0)
+				.unwrap(),
 			InvalidTransaction::Payment
 		);
 	});
@@ -83,9 +89,15 @@ fn transaction_with_to_low_nonce_should_not_work() {
 			transaction: signed,
 		};
 		let source = call.check_self_contained().unwrap().unwrap();
+		let extrinsic = fp_self_contained::CheckedExtrinsic::<u64, crate::mock::Call, SignedExtra, H160> {
+			signed: fp_self_contained::CheckedSignature::SelfContained(source),
+			function: Call::Ethereum(call.clone()),
+		};
+		let dispatch_info = extrinsic.get_dispatch_info();
 
 		assert_eq!(
-			call.validate_self_contained(&source).unwrap(),
+			call.validate_self_contained(&source, &dispatch_info, 0)
+				.unwrap(),
 			ValidTransactionBuilder::default()
 				.and_provides((alice.address, U256::from(1)))
 				.priority(0u64)
@@ -105,9 +117,15 @@ fn transaction_with_to_low_nonce_should_not_work() {
 			transaction: signed2,
 		};
 		let source2 = call2.check_self_contained().unwrap().unwrap();
+		let extrinsic2 = fp_self_contained::CheckedExtrinsic::<u64, crate::mock::Call, SignedExtra, _> {
+			signed: fp_self_contained::CheckedSignature::SelfContained(source),
+			function: Call::Ethereum(call2.clone()),
+		};
 
 		assert_err!(
-			call2.validate_self_contained(&source2).unwrap(),
+			call2
+				.validate_self_contained(&source2, &extrinsic2.get_dispatch_info(), 0)
+				.unwrap(),
 			InvalidTransaction::Stale
 		);
 	});
@@ -334,7 +352,7 @@ fn self_contained_transaction_with_extra_gas_should_adjust_weight_with_post_disp
 			transaction: signed,
 		};
 		let source = call.check_self_contained().unwrap().unwrap();
-		let extrinsic = CheckedExtrinsic::<_, _, frame_system::CheckWeight<Test>, _> {
+		let extrinsic = fp_self_contained::CheckedExtrinsic::<_, _, frame_system::CheckWeight<Test>, _> {
 			signed: fp_self_contained::CheckedSignature::SelfContained(source),
 			function: Call::Ethereum(call),
 		};
diff --git a/frame/ethereum/src/tests/mod.rs b/frame/ethereum/src/tests/mod.rs
index d31f13bbee..bb44656d67 100644
--- a/frame/ethereum/src/tests/mod.rs
+++ b/frame/ethereum/src/tests/mod.rs
@@ -1,4 +1,4 @@
-use frame_support::{assert_err, assert_ok, unsigned::TransactionValidityError};
+use frame_support::{assert_err, assert_ok, unsigned::TransactionValidityError, weights::GetDispatchInfo};
 use rustc_hex::{FromHex, ToHex};
 use sp_runtime::{
 	traits::Applyable,
diff --git a/primitives/self-contained/src/checked_extrinsic.rs b/primitives/self-contained/src/checked_extrinsic.rs
index 21db1d575f..b2c2e9da6b 100644
--- a/primitives/self-contained/src/checked_extrinsic.rs
+++ b/primitives/self-contained/src/checked_extrinsic.rs
@@ -87,11 +87,12 @@ where
 				let unsigned_validation = U::validate_unsigned(source, &self.function)?;
 				Ok(valid.combine_with(unsigned_validation))
 			}
-			CheckedSignature::SelfContained(signed_info) => {
-				self.function.validate_self_contained(&signed_info).ok_or(
-					TransactionValidityError::Invalid(InvalidTransaction::BadProof),
-				)?
-			}
+			CheckedSignature::SelfContained(signed_info) => self
+				.function
+				.validate_self_contained(signed_info, info, len)
+				.ok_or(TransactionValidityError::Invalid(
+					InvalidTransaction::BadProof,
+				))?
 		}
 	}
 
@@ -139,7 +140,7 @@ where
 			CheckedSignature::SelfContained(signed_info) => {
 				// If pre-dispatch fail, the block must be considered invalid
 				self.function
-					.pre_dispatch_self_contained(&signed_info)
+					.pre_dispatch_self_contained(&signed_info, info, len)
 					.ok_or(TransactionValidityError::Invalid(
 						InvalidTransaction::BadProof,
 					))??;
diff --git a/primitives/self-contained/src/lib.rs b/primitives/self-contained/src/lib.rs
index 62cca45818..3e2afe1cfa 100644
--- a/primitives/self-contained/src/lib.rs
+++ b/primitives/self-contained/src/lib.rs
@@ -26,7 +26,7 @@ pub use crate::{
 };
 
 use sp_runtime::{
-	traits::{Dispatchable, PostDispatchInfoOf},
+	traits::{DispatchInfoOf, Dispatchable, PostDispatchInfoOf},
 	transaction_validity::{TransactionValidity, TransactionValidityError},
 };
 
@@ -43,7 +43,12 @@ pub trait SelfContainedCall: Dispatchable {
 	fn check_self_contained(&self) -> Option<Result<Self::SignedInfo, TransactionValidityError>>;
 	/// Validate a self-contained function. Returns `None` if the
 	/// function is not a self-contained.
-	fn validate_self_contained(&self, info: &Self::SignedInfo) -> Option<TransactionValidity>;
+	fn validate_self_contained(
+		&self,
+		info: &Self::SignedInfo,
+		dispatch_info: &DispatchInfoOf<Self>,
+		len: usize,
+	) -> Option<TransactionValidity>;
 	/// Do any pre-flight stuff for a self-contained call.
 	///
 	/// Note this function by default delegates to `validate_self_contained`, so that
@@ -57,7 +62,12 @@ pub trait SelfContainedCall: Dispatchable {
 	fn pre_dispatch_self_contained(
 		&self,
 		info: &Self::SignedInfo,
-	) -> Option<Result<(), TransactionValidityError>>;
+		dispatch_info: &DispatchInfoOf<Self>,
+		len: usize,
+	) -> Option<Result<(), TransactionValidityError>> {
+		self.validate_self_contained(info, dispatch_info, len)
+			.map(|res| res.map(|_| ()))
+	}
 	/// Apply a self-contained function. Returns `None` if the
 	/// function is not a self-contained.
 	fn apply_self_contained(
diff --git a/template/runtime/src/lib.rs b/template/runtime/src/lib.rs
index 61c384f45f..b6121cdc74 100644
--- a/template/runtime/src/lib.rs
+++ b/template/runtime/src/lib.rs
@@ -22,7 +22,7 @@ use sp_core::{
 use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
 	traits::{
-		AccountIdLookup, BlakeTwo256, Block as BlockT, Dispatchable, IdentifyAccount, NumberFor,
+		AccountIdLookup, BlakeTwo256, Block as BlockT, Dispatchable, DispatchInfoOf, IdentifyAccount, NumberFor,
 		PostDispatchInfoOf, Verify,
 	},
 	transaction_validity::{TransactionSource, TransactionValidity, TransactionValidityError},
@@ -46,7 +46,7 @@ pub use frame_support::{
 };
 pub use pallet_balances::Call as BalancesCall;
 use pallet_ethereum::{Call::transact, Transaction as EthereumTransaction};
-use pallet_evm::{Account as EVMAccount, EnsureAddressTruncated, HashedAddressMapping, Runner};
+use pallet_evm::{Account as EVMAccount, EnsureAddressTruncated, GasWeightMapping, HashedAddressMapping, Runner};
 pub use pallet_timestamp::Call as TimestampCall;
 use pallet_transaction_payment::CurrencyAdapter;
 #[cfg(any(feature = "std", test))]
@@ -136,13 +136,15 @@ pub fn native_version() -> NativeVersion {
 }
 
 const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
+/// We allow for 2 seconds of compute with a 6 second average block time.
+pub const MAXIMUM_BLOCK_WEIGHT: Weight = 2 * WEIGHT_PER_SECOND;
+const WEIGHT_PER_GAS: u64 = 75_000;
 
 parameter_types! {
 	pub const Version: RuntimeVersion = VERSION;
 	pub const BlockHashCount: BlockNumber = 256;
-	/// We allow for 2 seconds of compute with a 6 second average block time.
 	pub BlockWeights: frame_system::limits::BlockWeights = frame_system::limits::BlockWeights
-		::with_sensible_defaults(2 * WEIGHT_PER_SECOND, NORMAL_DISPATCH_RATIO);
+		::with_sensible_defaults(MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO);
 	pub BlockLength: frame_system::limits::BlockLength = frame_system::limits::BlockLength
 		::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);
 	pub const SS58Prefix: u8 = 42;
@@ -299,15 +301,25 @@ impl<F: FindAuthor<u32>> FindAuthor<H160> for FindAuthorTruncated<F> {
 	}
 }
 
+pub struct FixedGasWeightMapping;
+impl GasWeightMapping for FixedGasWeightMapping {
+	fn gas_to_weight(gas: u64) -> Weight {
+		gas.saturating_mul(WEIGHT_PER_GAS)
+	}
+	fn weight_to_gas(weight: Weight) -> u64 {
+		weight.wrapping_div(WEIGHT_PER_GAS)
+	}
+}
+
 parameter_types! {
 	pub const ChainId: u64 = 42;
-	pub BlockGasLimit: U256 = U256::from(u32::max_value());
+	pub BlockGasLimit: U256 = U256::from(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT / WEIGHT_PER_GAS);
 	pub PrecompilesValue: FrontierPrecompiles<Runtime> = FrontierPrecompiles::<_>::new();
 }
 
 impl pallet_evm::Config for Runtime {
 	type FeeCalculator = BaseFee;
-	type GasWeightMapping = ();
+	type GasWeightMapping = FixedGasWeightMapping;
 	type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping<Self>;
 	type CallOrigin = EnsureAddressTruncated;
 	type WithdrawOrigin = EnsureAddressTruncated;
@@ -461,9 +473,14 @@ impl fp_self_contained::SelfContainedCall for Call {
 		}
 	}
 
-	fn validate_self_contained(&self, info: &Self::SignedInfo) -> Option<TransactionValidity> {
+	fn validate_self_contained(
+		&self,
+		info: &Self::SignedInfo,
+		dispatch_info: &DispatchInfoOf<Call>,
+		len: usize,
+	) -> Option<TransactionValidity> {
 		match self {
-			Call::Ethereum(call) => call.validate_self_contained(info),
+			Call::Ethereum(call) => call.validate_self_contained(info, dispatch_info, len),
 			_ => None,
 		}
 	}
@@ -471,9 +488,11 @@ impl fp_self_contained::SelfContainedCall for Call {
 	fn pre_dispatch_self_contained(
 		&self,
 		info: &Self::SignedInfo,
+		dispatch_info: &DispatchInfoOf<Call>,
+		len: usize,
 	) -> Option<Result<(), TransactionValidityError>> {
 		match self {
-			Call::Ethereum(call) => call.pre_dispatch_self_contained(info),
+			Call::Ethereum(call) => call.pre_dispatch_self_contained(info, dispatch_info, len),
 			_ => None,
 		}
 	}