diff --git a/Cargo.lock b/Cargo.lock
index 6354db1ab2..e24360634d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1680,29 +1680,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "cumulus-client-collator"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.31#fb8c5a3d0800ebdebe14bd0e708d2a348f976d9e"
-dependencies = [
- "cumulus-client-consensus-common",
- "cumulus-client-network",
- "cumulus-primitives-core",
- "futures",
- "parity-scale-codec",
- "parking_lot 0.12.1",
- "polkadot-node-primitives",
- "polkadot-node-subsystem",
- "polkadot-overseer",
- "polkadot-primitives",
- "sc-client-api",
- "sp-api",
- "sp-consensus",
- "sp-core 21.0.0",
- "sp-runtime 24.0.0",
- "tracing",
-]
-
 [[package]]
 name = "cumulus-client-collator"
 version = "0.1.0"
@@ -1732,7 +1709,7 @@ version = "0.1.0"
 source = "git+https://github.com/paritytech//cumulus?rev=a188eb95c522f3ca4c43ef7fed19a6107224217c#a188eb95c522f3ca4c43ef7fed19a6107224217c"
 dependencies = [
  "async-trait",
- "cumulus-client-collator 0.1.0 (git+https://github.com/paritytech//cumulus?rev=a188eb95c522f3ca4c43ef7fed19a6107224217c)",
+ "cumulus-client-collator",
  "cumulus-client-consensus-common",
  "cumulus-client-consensus-proposer",
  "cumulus-primitives-core",
@@ -1881,7 +1858,7 @@ version = "0.1.0"
 source = "git+https://github.com/paritytech//cumulus?rev=a188eb95c522f3ca4c43ef7fed19a6107224217c#a188eb95c522f3ca4c43ef7fed19a6107224217c"
 dependencies = [
  "cumulus-client-cli",
- "cumulus-client-collator 0.1.0 (git+https://github.com/paritytech//cumulus?rev=a188eb95c522f3ca4c43ef7fed19a6107224217c)",
+ "cumulus-client-collator",
  "cumulus-client-consensus-common",
  "cumulus-client-network",
  "cumulus-client-pov-recovery",
@@ -3310,7 +3287,7 @@ dependencies = [
 [[package]]
 name = "fc-api"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 dependencies = [
  "async-trait",
  "fp-storage",
@@ -3322,7 +3299,7 @@ dependencies = [
 [[package]]
 name = "fc-consensus"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 dependencies = [
  "async-trait",
  "fp-consensus",
@@ -3338,7 +3315,7 @@ dependencies = [
 [[package]]
 name = "fc-db"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 dependencies = [
  "async-trait",
  "ethereum",
@@ -3369,7 +3346,7 @@ dependencies = [
 [[package]]
 name = "fc-mapping-sync"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 dependencies = [
  "fc-db",
  "fc-storage",
@@ -3392,7 +3369,7 @@ dependencies = [
 [[package]]
 name = "fc-rpc"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -3442,7 +3419,7 @@ dependencies = [
 [[package]]
 name = "fc-rpc-core"
 version = "1.1.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -3455,7 +3432,7 @@ dependencies = [
 [[package]]
 name = "fc-storage"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -3672,7 +3649,7 @@ dependencies = [
 [[package]]
 name = "fp-account"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 dependencies = [
  "hex",
  "impl-serde 0.4.0",
@@ -3691,7 +3668,7 @@ dependencies = [
 [[package]]
 name = "fp-consensus"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 dependencies = [
  "ethereum",
  "parity-scale-codec",
@@ -3703,7 +3680,7 @@ dependencies = [
 [[package]]
 name = "fp-ethereum"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -3717,7 +3694,7 @@ dependencies = [
 [[package]]
 name = "fp-evm"
 version = "3.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 dependencies = [
  "evm",
  "frame-support",
@@ -3732,7 +3709,7 @@ dependencies = [
 [[package]]
 name = "fp-rpc"
 version = "3.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -3749,7 +3726,7 @@ dependencies = [
 [[package]]
 name = "fp-self-contained"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3761,7 +3738,7 @@ dependencies = [
 [[package]]
 name = "fp-storage"
 version = "2.0.0"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -4820,6 +4797,12 @@ dependencies = [
  "hashbrown 0.14.0",
 ]
 
+[[package]]
+name = "indexmap-nostd"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590"
+
 [[package]]
 name = "indicatif"
 version = "0.17.5"
@@ -4875,7 +4858,7 @@ dependencies = [
  "btc-relay-rpc-runtime-api",
  "clap",
  "cumulus-client-cli",
- "cumulus-client-collator 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.31)",
+ "cumulus-client-collator",
  "cumulus-client-consensus-aura",
  "cumulus-client-consensus-common",
  "cumulus-client-consensus-relay-chain",
@@ -4991,6 +4974,7 @@ dependencies = [
  "dex-general-rpc",
  "dex-stable-rpc",
  "escrow-rpc",
+ "fc-api",
  "fc-db",
  "fc-mapping-sync",
  "fc-rpc",
@@ -5166,6 +5150,12 @@ dependencies = [
  "xcm-executor",
 ]
 
+[[package]]
+name = "intx"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f38a50a899dc47a6d0ed5508e7f601a2e34c3a85303514b5d137f3c10a0c75"
+
 [[package]]
 name = "io-lifetimes"
 version = "1.0.11"
@@ -5531,7 +5521,7 @@ dependencies = [
  "pallet-base-fee",
  "pallet-collective",
  "pallet-contracts",
- "pallet-contracts-primitives",
+ "pallet-contracts-primitives 6.0.0",
  "pallet-ethereum",
  "pallet-evm",
  "pallet-evm-chain-id",
@@ -7763,7 +7753,7 @@ dependencies = [
 [[package]]
 name = "pallet-base-fee"
 version = "1.0.0"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 dependencies = [
  "fp-evm",
  "frame-support",
@@ -7874,15 +7864,16 @@ dependencies = [
 [[package]]
 name = "pallet-contracts"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
+source = "git+https://github.com/paritytech//substrate?rev=6d28d2eb6fa1589105e970ff1b97555d91a1495b#6d28d2eb6fa1589105e970ff1b97555d91a1495b"
 dependencies = [
  "bitflags 1.3.2",
+ "environmental",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
  "log",
- "pallet-contracts-primitives",
+ "pallet-contracts-primitives 24.0.0",
  "pallet-contracts-proc-macro",
  "parity-scale-codec",
  "rand 0.8.5",
@@ -7890,13 +7881,12 @@ dependencies = [
  "serde",
  "smallvec",
  "sp-api",
- "sp-core 6.0.0",
- "sp-io 6.0.0",
- "sp-runtime 6.0.0",
- "sp-sandbox",
- "sp-std 4.0.0",
- "wasm-instrument",
- "wasmi-validation",
+ "sp-core 21.0.0",
+ "sp-io 23.0.0",
+ "sp-runtime 24.0.0",
+ "sp-std 8.0.0",
+ "wasm-instrument 0.4.0",
+ "wasmi 0.30.0",
 ]
 
 [[package]]
@@ -7911,14 +7901,27 @@ dependencies = [
  "sp-weights 4.0.0",
 ]
 
+[[package]]
+name = "pallet-contracts-primitives"
+version = "24.0.0"
+source = "git+https://github.com/paritytech//substrate?rev=6d28d2eb6fa1589105e970ff1b97555d91a1495b#6d28d2eb6fa1589105e970ff1b97555d91a1495b"
+dependencies = [
+ "bitflags 1.3.2",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-runtime 24.0.0",
+ "sp-std 8.0.0",
+ "sp-weights 20.0.0",
+]
+
 [[package]]
 name = "pallet-contracts-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
+source = "git+https://github.com/paritytech//substrate?rev=6d28d2eb6fa1589105e970ff1b97555d91a1495b#6d28d2eb6fa1589105e970ff1b97555d91a1495b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -8014,7 +8017,7 @@ dependencies = [
 [[package]]
 name = "pallet-ethereum"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -8037,7 +8040,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm"
 version = "6.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 dependencies = [
  "environmental",
  "evm",
@@ -8062,7 +8065,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-chain-id"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8083,7 +8086,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-modexp"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 dependencies = [
  "fp-evm",
  "num",
@@ -8092,7 +8095,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-sha3fips"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 dependencies = [
  "fp-evm",
  "tiny-keccak",
@@ -8101,7 +8104,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-simple"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 dependencies = [
  "fp-evm",
  "ripemd",
@@ -8883,7 +8886,7 @@ dependencies = [
  "pallet-balances",
  "pallet-collective",
  "pallet-contracts",
- "pallet-contracts-primitives",
+ "pallet-contracts-primitives 6.0.0",
  "pallet-ethereum",
  "pallet-evm",
  "pallet-evm-chain-id",
@@ -12430,7 +12433,7 @@ dependencies = [
  "sp-maybe-compressed-blob",
  "sp-wasm-interface 14.0.0",
  "thiserror",
- "wasm-instrument",
+ "wasm-instrument 0.3.0",
 ]
 
 [[package]]
@@ -13878,7 +13881,7 @@ dependencies = [
  "substrate-bip39",
  "thiserror",
  "tiny-bip39 0.8.2",
- "wasmi",
+ "wasmi 0.13.2",
  "zeroize",
 ]
 
@@ -14315,20 +14318,6 @@ dependencies = [
  "syn 2.0.28",
 ]
 
-[[package]]
-name = "sp-sandbox"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
-dependencies = [
- "log",
- "parity-scale-codec",
- "sp-core 6.0.0",
- "sp-io 6.0.0",
- "sp-std 4.0.0",
- "sp-wasm-interface 6.0.0",
- "wasmi",
-]
-
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
@@ -14597,7 +14586,7 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "sp-std 4.0.0",
- "wasmi",
+ "wasmi 0.13.2",
 ]
 
 [[package]]
@@ -16257,6 +16246,15 @@ dependencies = [
  "parity-wasm",
 ]
 
+[[package]]
+name = "wasm-instrument"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a47ecb37b9734d1085eaa5ae1a81e60801fd8c28d4cabdd8aedb982021918bc"
+dependencies = [
+ "parity-wasm",
+]
+
 [[package]]
 name = "wasm-opt"
 version = "0.112.0"
@@ -16320,7 +16318,21 @@ checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422"
 dependencies = [
  "parity-wasm",
  "wasmi-validation",
- "wasmi_core",
+ "wasmi_core 0.2.1",
+]
+
+[[package]]
+name = "wasmi"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51fb5c61993e71158abf5bb863df2674ca3ec39ed6471c64f07aeaf751d67b4"
+dependencies = [
+ "intx",
+ "smallvec",
+ "spin 0.9.8",
+ "wasmi_arena",
+ "wasmi_core 0.12.0",
+ "wasmparser-nostd",
 ]
 
 [[package]]
@@ -16332,6 +16344,12 @@ dependencies = [
  "parity-wasm",
 ]
 
+[[package]]
+name = "wasmi_arena"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "401c1f35e413fac1846d4843745589d9ec678977ab35a384db8ae7830525d468"
+
 [[package]]
 name = "wasmi_core"
 version = "0.2.1"
@@ -16345,6 +16363,18 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "wasmi_core"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "624e6333e861ef49095d2d678b76ebf30b06bf37effca845be7e5b87c90071b7"
+dependencies = [
+ "downcast-rs",
+ "libm 0.2.7",
+ "num-traits",
+ "paste",
+]
+
 [[package]]
 name = "wasmparser"
 version = "0.102.0"
@@ -16355,6 +16385,15 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "wasmparser-nostd"
+version = "0.100.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724"
+dependencies = [
+ "indexmap-nostd",
+]
+
 [[package]]
 name = "wasmtime"
 version = "8.0.1"
@@ -17413,30 +17452,70 @@ dependencies = [
  "pkg-config",
 ]
 
+[[patch.unused]]
+name = "asset-hub-kusama-runtime"
+version = "0.9.420"
+source = "git+https://github.com/paritytech//cumulus?rev=a188eb95c522f3ca4c43ef7fed19a6107224217c#a188eb95c522f3ca4c43ef7fed19a6107224217c"
+
+[[patch.unused]]
+name = "asset-hub-polkadot-runtime"
+version = "0.9.420"
+source = "git+https://github.com/paritytech//cumulus?rev=a188eb95c522f3ca4c43ef7fed19a6107224217c#a188eb95c522f3ca4c43ef7fed19a6107224217c"
+
+[[patch.unused]]
+name = "cumulus-test-relay-validation-worker-provider"
+version = "0.1.0"
+source = "git+https://github.com/paritytech//cumulus?rev=a188eb95c522f3ca4c43ef7fed19a6107224217c#a188eb95c522f3ca4c43ef7fed19a6107224217c"
+
+[[patch.unused]]
+name = "parachains-common"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//cumulus?rev=a188eb95c522f3ca4c43ef7fed19a6107224217c#a188eb95c522f3ca4c43ef7fed19a6107224217c"
+
+[[patch.unused]]
+name = "xcm-emulator"
+version = "0.1.0"
+source = "git+https://github.com/paritytech//cumulus?rev=a188eb95c522f3ca4c43ef7fed19a6107224217c#a188eb95c522f3ca4c43ef7fed19a6107224217c"
+
 [[patch.unused]]
 name = "fc-cli"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 
 [[patch.unused]]
 name = "fp-dynamic-fee"
 version = "1.0.0"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 
 [[patch.unused]]
 name = "pallet-dynamic-fee"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 
 [[patch.unused]]
 name = "pallet-evm-test-vector-support"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
 
 [[patch.unused]]
 name = "pallet-hotfix-sufficients"
 version = "1.0.0"
-source = "git+https://github.com/paritytech//frontier?rev=ff8bd85fe73da92a6266b1f3859e9e9c78a5f420#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+
+[[patch.unused]]
+name = "polkadot-test-runtime"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=1ed6e2e50a4ce61f6cda46a730efc11a07b6ebb3#1ed6e2e50a4ce61f6cda46a730efc11a07b6ebb3"
+
+[[patch.unused]]
+name = "polkadot-test-service"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=1ed6e2e50a4ce61f6cda46a730efc11a07b6ebb3#1ed6e2e50a4ce61f6cda46a730efc11a07b6ebb3"
+
+[[patch.unused]]
+name = "test-runtime-constants"
+version = "1.0.0"
+source = "git+https://github.com/paritytech//polkadot?rev=1ed6e2e50a4ce61f6cda46a730efc11a07b6ebb3#1ed6e2e50a4ce61f6cda46a730efc11a07b6ebb3"
 
 [[patch.unused]]
 name = "pallet-asset-tx-payment"
@@ -17487,43 +17566,3 @@ source = "git+https://github.com/paritytech//substrate?rev=6d28d2eb6fa1589105e97
 name = "substrate-test-utils-derive"
 version = "0.10.0-dev"
 source = "git+https://github.com/paritytech//substrate?rev=6d28d2eb6fa1589105e970ff1b97555d91a1495b#6d28d2eb6fa1589105e970ff1b97555d91a1495b"
-
-[[patch.unused]]
-name = "asset-hub-kusama-runtime"
-version = "0.9.420"
-source = "git+https://github.com/paritytech//cumulus?rev=a188eb95c522f3ca4c43ef7fed19a6107224217c#a188eb95c522f3ca4c43ef7fed19a6107224217c"
-
-[[patch.unused]]
-name = "asset-hub-polkadot-runtime"
-version = "0.9.420"
-source = "git+https://github.com/paritytech//cumulus?rev=a188eb95c522f3ca4c43ef7fed19a6107224217c#a188eb95c522f3ca4c43ef7fed19a6107224217c"
-
-[[patch.unused]]
-name = "cumulus-test-relay-validation-worker-provider"
-version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=a188eb95c522f3ca4c43ef7fed19a6107224217c#a188eb95c522f3ca4c43ef7fed19a6107224217c"
-
-[[patch.unused]]
-name = "parachains-common"
-version = "1.0.0"
-source = "git+https://github.com/paritytech//cumulus?rev=a188eb95c522f3ca4c43ef7fed19a6107224217c#a188eb95c522f3ca4c43ef7fed19a6107224217c"
-
-[[patch.unused]]
-name = "xcm-emulator"
-version = "0.1.0"
-source = "git+https://github.com/paritytech//cumulus?rev=a188eb95c522f3ca4c43ef7fed19a6107224217c#a188eb95c522f3ca4c43ef7fed19a6107224217c"
-
-[[patch.unused]]
-name = "polkadot-test-runtime"
-version = "1.0.0"
-source = "git+https://github.com/paritytech//polkadot?rev=1ed6e2e50a4ce61f6cda46a730efc11a07b6ebb3#1ed6e2e50a4ce61f6cda46a730efc11a07b6ebb3"
-
-[[patch.unused]]
-name = "polkadot-test-service"
-version = "1.0.0"
-source = "git+https://github.com/paritytech//polkadot?rev=1ed6e2e50a4ce61f6cda46a730efc11a07b6ebb3#1ed6e2e50a4ce61f6cda46a730efc11a07b6ebb3"
-
-[[patch.unused]]
-name = "test-runtime-constants"
-version = "1.0.0"
-source = "git+https://github.com/paritytech//polkadot?rev=1ed6e2e50a4ce61f6cda46a730efc11a07b6ebb3#1ed6e2e50a4ce61f6cda46a730efc11a07b6ebb3"
diff --git a/Cargo.toml b/Cargo.toml
index f77f45de03..97a750c1ed 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -190,6 +190,8 @@ try-runtime-cli = { git = "https://github.com/paritytech//substrate", rev = "6d2
 pallet-glutton = { git = "https://github.com/paritytech//substrate", rev = "6d28d2eb6fa1589105e970ff1b97555d91a1495b" }
 sp-database = { git = "https://github.com/paritytech//substrate", rev = "6d28d2eb6fa1589105e970ff1b97555d91a1495b" }
 pallet-message-queue = { git = "https://github.com/paritytech//substrate", rev = "6d28d2eb6fa1589105e970ff1b97555d91a1495b" }
+pallet-contracts = { git = "https://github.com/paritytech//substrate", rev = "6d28d2eb6fa1589105e970ff1b97555d91a1495b" }
+pallet-contracts-primitives = { git = "https://github.com/paritytech//substrate", rev = "6d28d2eb6fa1589105e970ff1b97555d91a1495b" }
 
 [patch."https://github.com/paritytech/polkadot"]
 kusama-runtime = { git = "https://github.com/paritytech//polkadot", rev = "1ed6e2e50a4ce61f6cda46a730efc11a07b6ebb3" }
@@ -232,6 +234,7 @@ polkadot-collator-protocol = { git = "https://github.com/paritytech//polkadot",
 polkadot-availability-recovery = { git = "https://github.com/paritytech//polkadot", rev = "1ed6e2e50a4ce61f6cda46a730efc11a07b6ebb3" }
 
 [patch."https://github.com/paritytech/cumulus"]
+cumulus-client-collator = { git = "https://github.com/paritytech//cumulus", rev = "a188eb95c522f3ca4c43ef7fed19a6107224217c" }
 cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", rev = "a188eb95c522f3ca4c43ef7fed19a6107224217c" }
 cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", rev = "a188eb95c522f3ca4c43ef7fed19a6107224217c" }
 cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", rev = "a188eb95c522f3ca4c43ef7fed19a6107224217c" }
@@ -272,31 +275,31 @@ orml-xcm = { git = "https://github.com/open-web3-stack//open-runtime-module-libr
 orml-xtokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v1.0.0" }
 
 [patch."https://github.com/paritytech/frontier"]
-fc-api = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-fc-cli = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-fc-consensus = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-fc-db = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-fc-mapping-sync = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-fc-rpc = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-fc-rpc-core = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-fc-storage = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
+fc-api = { git = "https://github.com/paritytech//frontier", branch = "master" }
+fc-cli = { git = "https://github.com/paritytech//frontier", branch = "master" }
+fc-consensus = { git = "https://github.com/paritytech//frontier", branch = "master" }
+fc-db = { git = "https://github.com/paritytech//frontier", branch = "master" }
+fc-mapping-sync = { git = "https://github.com/paritytech//frontier", branch = "master" }
+fc-rpc = { git = "https://github.com/paritytech//frontier", branch = "master" }
+fc-rpc-core = { git = "https://github.com/paritytech//frontier", branch = "master" }
+fc-storage = { git = "https://github.com/paritytech//frontier", branch = "master" }
 # Frontier Primitive
-fp-account = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-fp-consensus = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-fp-dynamic-fee = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-fp-ethereum = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-fp-evm = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-fp-rpc = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-fp-self-contained = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-fp-storage = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
+fp-account = { git = "https://github.com/paritytech//frontier", branch = "master" }
+fp-consensus = { git = "https://github.com/paritytech//frontier", branch = "master" }
+fp-dynamic-fee = { git = "https://github.com/paritytech//frontier", branch = "master" }
+fp-ethereum = { git = "https://github.com/paritytech//frontier", branch = "master" }
+fp-evm = { git = "https://github.com/paritytech//frontier", branch = "master" }
+fp-rpc = { git = "https://github.com/paritytech//frontier", branch = "master" }
+fp-self-contained = { git = "https://github.com/paritytech//frontier", branch = "master" }
+fp-storage = { git = "https://github.com/paritytech//frontier", branch = "master" }
 # Frontier FRAME
-pallet-base-fee = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-pallet-dynamic-fee = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-pallet-ethereum = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-pallet-evm = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-pallet-evm-chain-id = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-pallet-evm-precompile-modexp = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-pallet-evm-precompile-sha3fips = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-pallet-evm-precompile-simple = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-pallet-evm-test-vector-support = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
-pallet-hotfix-sufficients = { git = "https://github.com/paritytech//frontier", rev = "ff8bd85fe73da92a6266b1f3859e9e9c78a5f420" }
+pallet-base-fee = { git = "https://github.com/paritytech//frontier", branch = "master" }
+pallet-dynamic-fee = { git = "https://github.com/paritytech//frontier", branch = "master" }
+pallet-ethereum = { git = "https://github.com/paritytech//frontier", branch = "master" }
+pallet-evm = { git = "https://github.com/paritytech//frontier", branch = "master" }
+pallet-evm-chain-id = { git = "https://github.com/paritytech//frontier", branch = "master" }
+pallet-evm-precompile-modexp = { git = "https://github.com/paritytech//frontier", branch = "master" }
+pallet-evm-precompile-sha3fips = { git = "https://github.com/paritytech//frontier", branch = "master" }
+pallet-evm-precompile-simple = { git = "https://github.com/paritytech//frontier", branch = "master" }
+pallet-evm-test-vector-support = { git = "https://github.com/paritytech//frontier", branch = "master" }
+pallet-hotfix-sufficients = { git = "https://github.com/paritytech//frontier", branch = "master" }
diff --git a/crates/annuity/src/mock.rs b/crates/annuity/src/mock.rs
index 60f8094d72..e530913501 100644
--- a/crates/annuity/src/mock.rs
+++ b/crates/annuity/src/mock.rs
@@ -82,7 +82,7 @@ impl pallet_balances::Config for Test {
     type MaxLocks = ();
     type MaxReserves = ();
     type ReserveIdentifier = [u8; 8];
-    type HoldIdentifier = ();
+    type RuntimeHoldReason = ();
     type FreezeIdentifier = ();
     type MaxFreezes = ();
     type MaxHolds = ();
diff --git a/crates/btc-relay/src/lib.rs b/crates/btc-relay/src/lib.rs
index 9844414331..f73e024f0b 100644
--- a/crates/btc-relay/src/lib.rs
+++ b/crates/btc-relay/src/lib.rs
@@ -379,6 +379,7 @@ pub mod pallet {
     pub(super) type DisableInclusionCheck<T: Config> = StorageValue<_, bool, ValueQuery>;
 
     #[pallet::genesis_config]
+    #[derive(frame_support::DefaultNoBound)]
     pub struct GenesisConfig<T: Config> {
         /// Global security parameter k for stable Bitcoin transactions
         pub bitcoin_confirmations: u32,
@@ -390,18 +391,6 @@ pub mod pallet {
         pub disable_inclusion_check: bool,
     }
 
-    #[cfg(feature = "std")]
-    impl<T: Config> Default for GenesisConfig<T> {
-        fn default() -> Self {
-            Self {
-                bitcoin_confirmations: Default::default(),
-                parachain_confirmations: Default::default(),
-                disable_difficulty_check: Default::default(),
-                disable_inclusion_check: Default::default(),
-            }
-        }
-    }
-
     #[pallet::genesis_build]
     impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
         fn build(&self) {
diff --git a/crates/collator-selection/src/lib.rs b/crates/collator-selection/src/lib.rs
index d9062960bd..52bb5581fa 100644
--- a/crates/collator-selection/src/lib.rs
+++ b/crates/collator-selection/src/lib.rs
@@ -61,7 +61,6 @@ pub mod pallet {
     use core::ops::Div;
     use frame_support::{
         dispatch::{DispatchClass, DispatchResultWithPostInfo},
-        inherent::Vec,
         pallet_prelude::*,
         sp_runtime::{
             traits::{AccountIdConversion, CheckedSub, Saturating, Zero},
@@ -74,7 +73,7 @@ pub mod pallet {
     use pallet_session::SessionManager;
     use sp_runtime::traits::Convert;
     use sp_staking::SessionIndex;
-
+    use sp_std::prelude::*;
     type BalanceOf<T> = <<T as Config>::StakingCurrency as Currency<<T as SystemConfig>::AccountId>>::Balance;
 
     /// A convertor from collators id. Since this pallet does not have stash/controller, this is
@@ -178,23 +177,13 @@ pub mod pallet {
     pub type CandidacyBond<T> = StorageValue<_, BalanceOf<T>, ValueQuery>;
 
     #[pallet::genesis_config]
+    #[derive(frame_support::DefaultNoBound)]
     pub struct GenesisConfig<T: Config> {
         pub invulnerables: Vec<T::AccountId>,
         pub candidacy_bond: BalanceOf<T>,
         pub desired_candidates: u32,
     }
 
-    #[cfg(feature = "std")]
-    impl<T: Config> Default for GenesisConfig<T> {
-        fn default() -> Self {
-            Self {
-                invulnerables: Default::default(),
-                candidacy_bond: Default::default(),
-                desired_candidates: Default::default(),
-            }
-        }
-    }
-
     #[pallet::genesis_build]
     impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
         fn build(&self) {
diff --git a/crates/collator-selection/src/mock.rs b/crates/collator-selection/src/mock.rs
index 4997a5ecc0..70d16ac767 100644
--- a/crates/collator-selection/src/mock.rs
+++ b/crates/collator-selection/src/mock.rs
@@ -96,7 +96,7 @@ impl pallet_balances::Config for Test {
     type MaxLocks = ();
     type MaxReserves = MaxReserves;
     type ReserveIdentifier = [u8; 8];
-    type HoldIdentifier = ();
+    type RuntimeHoldReason = ();
     type FreezeIdentifier = ();
     type MaxFreezes = ();
     type MaxHolds = ();
diff --git a/crates/democracy/src/lib.rs b/crates/democracy/src/lib.rs
index 81a6ee50fc..af945ef3cf 100644
--- a/crates/democracy/src/lib.rs
+++ b/crates/democracy/src/lib.rs
@@ -255,21 +255,12 @@ pub mod pallet {
     pub type NextLaunchTimestamp<T: Config> = StorageValue<_, u64, ValueQuery>;
 
     #[pallet::genesis_config]
+    #[derive(frame_support::DefaultNoBound)]
     pub struct GenesisConfig<T: Config> {
         _phantom: sp_std::marker::PhantomData<T>,
         next_launch_timestamp: u64,
     }
 
-    #[cfg(feature = "std")]
-    impl<T: Config> Default for GenesisConfig<T> {
-        fn default() -> Self {
-            GenesisConfig {
-                _phantom: Default::default(),
-                next_launch_timestamp: 0,
-            }
-        }
-    }
-
     #[pallet::genesis_build]
     impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
         fn build(&self) {
diff --git a/crates/democracy/src/tests.rs b/crates/democracy/src/tests.rs
index aa18c16601..305ff2c6f2 100644
--- a/crates/democracy/src/tests.rs
+++ b/crates/democracy/src/tests.rs
@@ -142,7 +142,7 @@ impl pallet_balances::Config for Test {
     type ExistentialDeposit = ExistentialDeposit;
     type AccountStore = System;
     type WeightInfo = ();
-    type HoldIdentifier = ();
+    type RuntimeHoldReason = ();
     type FreezeIdentifier = ();
     type MaxFreezes = ();
     type MaxHolds = ();
diff --git a/crates/dex-general/src/lib.rs b/crates/dex-general/src/lib.rs
index df5b377330..74bdbaa468 100644
--- a/crates/dex-general/src/lib.rs
+++ b/crates/dex-general/src/lib.rs
@@ -22,7 +22,7 @@ pub use pallet::*;
 
 use codec::{Decode, Encode, FullCodec};
 use frame_support::{
-    inherent::Vec, pallet_prelude::*, storage::bounded_btree_map::BoundedBTreeMap, traits::Get, PalletId, RuntimeDebug,
+    pallet_prelude::*, storage::bounded_btree_map::BoundedBTreeMap, traits::Get, PalletId, RuntimeDebug,
 };
 use orml_traits::MultiCurrency;
 use sp_core::U256;
@@ -174,6 +174,7 @@ pub mod pallet {
     >;
 
     #[pallet::genesis_config]
+    #[derive(frame_support::DefaultNoBound)]
     /// Refer: https://github.com/Uniswap/uniswap-v2-core/blob/master/contracts/UniswapV2Pair.sol#L88
     pub struct GenesisConfig<T: Config> {
         /// The receiver of the protocol fee.
@@ -183,16 +184,6 @@ pub mod pallet {
         pub fee_point: u8,
     }
 
-    #[cfg(feature = "std")]
-    impl<T: Config> Default for GenesisConfig<T> {
-        fn default() -> Self {
-            Self {
-                fee_receiver: None,
-                fee_point: 5,
-            }
-        }
-    }
-
     #[pallet::genesis_build]
     impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
         fn build(&self) {
diff --git a/crates/dex-stable/src/mock.rs b/crates/dex-stable/src/mock.rs
index 06b2929b1a..7594891030 100644
--- a/crates/dex-stable/src/mock.rs
+++ b/crates/dex-stable/src/mock.rs
@@ -146,7 +146,7 @@ impl pallet_balances::Config for Test {
     type MaxLocks = ();
     type MaxReserves = MaxReserves;
     type ReserveIdentifier = [u8; 8];
-    type HoldIdentifier = ();
+    type RuntimeHoldReason = ();
     type FreezeIdentifier = ();
     type MaxFreezes = ();
     type MaxHolds = ();
diff --git a/crates/escrow/src/mock.rs b/crates/escrow/src/mock.rs
index 32cebfcbaa..05ea2800ce 100644
--- a/crates/escrow/src/mock.rs
+++ b/crates/escrow/src/mock.rs
@@ -83,7 +83,7 @@ impl pallet_balances::Config for Test {
     type MaxLocks = ();
     type MaxReserves = ();
     type ReserveIdentifier = [u8; 8];
-    type HoldIdentifier = ();
+    type RuntimeHoldReason = ();
     type FreezeIdentifier = ();
     type MaxFreezes = ();
     type MaxHolds = ();
diff --git a/crates/fee/src/lib.rs b/crates/fee/src/lib.rs
index f068593be3..1cb3386b2e 100644
--- a/crates/fee/src/lib.rs
+++ b/crates/fee/src/lib.rs
@@ -176,6 +176,7 @@ pub mod pallet {
         StorageMap<_, Blake2_128Concat, DefaultVaultId<T>, UnsignedFixedPoint<T>, OptionQuery>;
 
     #[pallet::genesis_config]
+    #[derive(frame_support::DefaultNoBound)]
     pub struct GenesisConfig<T: Config> {
         pub issue_fee: UnsignedFixedPoint<T>,
         pub issue_griefing_collateral: UnsignedFixedPoint<T>,
@@ -185,20 +186,6 @@ pub mod pallet {
         pub replace_griefing_collateral: UnsignedFixedPoint<T>,
     }
 
-    #[cfg(feature = "std")]
-    impl<T: Config> Default for GenesisConfig<T> {
-        fn default() -> Self {
-            Self {
-                issue_fee: Default::default(),
-                issue_griefing_collateral: Default::default(),
-                redeem_fee: Default::default(),
-                premium_redeem_fee: Default::default(),
-                punishment_fee: Default::default(),
-                replace_griefing_collateral: Default::default(),
-            }
-        }
-    }
-
     #[pallet::genesis_build]
     impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
         fn build(&self) {
diff --git a/crates/issue/src/lib.rs b/crates/issue/src/lib.rs
index 509422f5ca..5d7e6db9a1 100644
--- a/crates/issue/src/lib.rs
+++ b/crates/issue/src/lib.rs
@@ -185,21 +185,12 @@ pub mod pallet {
     pub(super) type StorageVersion<T: Config> = StorageValue<_, Version, ValueQuery, DefaultForStorageVersion>;
 
     #[pallet::genesis_config]
+    #[derive(frame_support::DefaultNoBound)]
     pub struct GenesisConfig<T: Config> {
         pub issue_period: T::BlockNumber,
         pub issue_btc_dust_value: BalanceOf<T>,
     }
 
-    #[cfg(feature = "std")]
-    impl<T: Config> Default for GenesisConfig<T> {
-        fn default() -> Self {
-            Self {
-                issue_period: Default::default(),
-                issue_btc_dust_value: Default::default(),
-            }
-        }
-    }
-
     #[pallet::genesis_build]
     impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
         fn build(&self) {
diff --git a/crates/loans/src/lib.rs b/crates/loans/src/lib.rs
index 61e859ff58..9d06b307e5 100644
--- a/crates/loans/src/lib.rs
+++ b/crates/loans/src/lib.rs
@@ -577,21 +577,11 @@ pub mod pallet {
     pub(crate) type StorageVersion<T: Config> = StorageValue<_, Versions, ValueQuery, DefaultVersion<T>>;
 
     #[pallet::genesis_config]
+    #[derive(frame_support::DefaultNoBound)]
     pub struct GenesisConfig {
         pub max_exchange_rate: Rate,
         pub min_exchange_rate: Rate,
     }
-
-    #[cfg(feature = "std")]
-    impl Default for GenesisConfig {
-        fn default() -> Self {
-            Self {
-                max_exchange_rate: Rate::from_inner(DEFAULT_MAX_EXCHANGE_RATE),
-                min_exchange_rate: Rate::from_inner(DEFAULT_MIN_EXCHANGE_RATE),
-            }
-        }
-    }
-
     #[pallet::genesis_build]
     impl<T: Config> GenesisBuild<T> for GenesisConfig {
         fn build(&self) {
diff --git a/crates/oracle/src/lib.rs b/crates/oracle/src/lib.rs
index a9abc3e2cb..6ea1de2c1b 100644
--- a/crates/oracle/src/lib.rs
+++ b/crates/oracle/src/lib.rs
@@ -161,21 +161,12 @@ pub mod pallet {
     pub(super) type StorageVersion<T: Config> = StorageValue<_, Version, ValueQuery, DefaultForStorageVersion>;
 
     #[pallet::genesis_config]
+    #[derive(frame_support::DefaultNoBound)]
     pub struct GenesisConfig<T: Config> {
         pub max_delay: u32,
         pub authorized_oracles: Vec<(T::AccountId, NameOf<T>)>,
     }
 
-    #[cfg(feature = "std")]
-    impl<T: Config> Default for GenesisConfig<T> {
-        fn default() -> Self {
-            Self {
-                max_delay: Default::default(),
-                authorized_oracles: Default::default(),
-            }
-        }
-    }
-
     #[pallet::genesis_build]
     impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
         fn build(&self) {
diff --git a/crates/redeem/src/lib.rs b/crates/redeem/src/lib.rs
index ffd3acc3f3..29764b6f57 100644
--- a/crates/redeem/src/lib.rs
+++ b/crates/redeem/src/lib.rs
@@ -197,23 +197,13 @@ pub mod pallet {
     pub(super) type StorageVersion<T: Config> = StorageValue<_, Version, ValueQuery, DefaultForStorageVersion>;
 
     #[pallet::genesis_config]
+    #[derive(frame_support::DefaultNoBound)]
     pub struct GenesisConfig<T: Config> {
         pub redeem_period: T::BlockNumber,
         pub redeem_btc_dust_value: BalanceOf<T>,
         pub redeem_transaction_size: u32,
     }
 
-    #[cfg(feature = "std")]
-    impl<T: Config> Default for GenesisConfig<T> {
-        fn default() -> Self {
-            Self {
-                redeem_period: Default::default(),
-                redeem_btc_dust_value: Default::default(),
-                redeem_transaction_size: Default::default(),
-            }
-        }
-    }
-
     #[pallet::genesis_build]
     impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
         fn build(&self) {
diff --git a/crates/replace/src/lib.rs b/crates/replace/src/lib.rs
index 3187c8d4a3..b8c2775173 100644
--- a/crates/replace/src/lib.rs
+++ b/crates/replace/src/lib.rs
@@ -190,21 +190,12 @@ pub mod pallet {
     pub(super) type StorageVersion<T: Config> = StorageValue<_, Version, ValueQuery, DefaultForStorageVersion>;
 
     #[pallet::genesis_config]
+    #[derive(frame_support::DefaultNoBound)]
     pub struct GenesisConfig<T: Config> {
         pub replace_period: T::BlockNumber,
         pub replace_btc_dust_value: BalanceOf<T>,
     }
 
-    #[cfg(feature = "std")]
-    impl<T: Config> Default for GenesisConfig<T> {
-        fn default() -> Self {
-            Self {
-                replace_period: Default::default(),
-                replace_btc_dust_value: Default::default(),
-            }
-        }
-    }
-
     #[pallet::genesis_build]
     impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
         fn build(&self) {
diff --git a/crates/supply/src/lib.rs b/crates/supply/src/lib.rs
index 68ab198559..95ab695773 100644
--- a/crates/supply/src/lib.rs
+++ b/crates/supply/src/lib.rs
@@ -110,23 +110,13 @@ pub mod pallet {
     pub type Inflation<T: Config> = StorageValue<_, T::UnsignedFixedPoint, ValueQuery>;
 
     #[pallet::genesis_config]
+    #[derive(frame_support::DefaultNoBound)]
     pub struct GenesisConfig<T: Config> {
         pub initial_supply: BalanceOf<T>,
         pub start_height: T::BlockNumber,
         pub inflation: T::UnsignedFixedPoint,
     }
 
-    #[cfg(feature = "std")]
-    impl<T: Config> Default for GenesisConfig<T> {
-        fn default() -> Self {
-            Self {
-                initial_supply: Default::default(),
-                start_height: Default::default(),
-                inflation: Default::default(),
-            }
-        }
-    }
-
     #[pallet::genesis_build]
     impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
         fn build(&self) {
diff --git a/crates/supply/src/mock.rs b/crates/supply/src/mock.rs
index f280f90007..640c37fd9c 100644
--- a/crates/supply/src/mock.rs
+++ b/crates/supply/src/mock.rs
@@ -79,7 +79,7 @@ impl pallet_balances::Config for Test {
     type MaxLocks = ();
     type MaxReserves = ();
     type ReserveIdentifier = [u8; 8];
-    type HoldIdentifier = ();
+    type RuntimeHoldReason = ();
     type FreezeIdentifier = ();
     type MaxFreezes = ();
     type MaxHolds = ();
diff --git a/crates/tx-pause/src/lib.rs b/crates/tx-pause/src/lib.rs
index 3d892fb89a..7bb1a414b2 100644
--- a/crates/tx-pause/src/lib.rs
+++ b/crates/tx-pause/src/lib.rs
@@ -190,24 +190,13 @@ pub mod pallet {
 
     /// Configure the initial state of this pallet in the genesis block.
     #[pallet::genesis_config]
+    #[derive(frame_support::DefaultNoBound)]
     pub struct GenesisConfig<T: Config> {
         /// The initially paused calls.
         pub paused: Vec<FullNameOf<T>>,
         pub _phantom: PhantomData<T>,
     }
 
-    #[cfg(feature = "std")]
-    impl<T: Config> Default for GenesisConfig<T> {
-        // NOTE: `derive(Default)` does not work together with `#[pallet::genesis_config]`.
-        // We therefore need to add a trivial default impl.
-        fn default() -> Self {
-            Self {
-                paused: Default::default(),
-                _phantom: PhantomData,
-            }
-        }
-    }
-
     #[pallet::genesis_build]
     impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
         fn build(&self) {
diff --git a/crates/tx-pause/src/mock.rs b/crates/tx-pause/src/mock.rs
index 1a51eb0fca..0141f26aa5 100644
--- a/crates/tx-pause/src/mock.rs
+++ b/crates/tx-pause/src/mock.rs
@@ -75,7 +75,7 @@ impl pallet_balances::Config for Test {
     type MaxLocks = MaxLocks;
     type MaxReserves = ();
     type ReserveIdentifier = [u8; 8];
-    type HoldIdentifier = ();
+    type RuntimeHoldReason = ();
     type FreezeIdentifier = ();
     type MaxFreezes = ();
     type MaxHolds = ();
diff --git a/crates/vault-registry/src/lib.rs b/crates/vault-registry/src/lib.rs
index c6321504d0..10713ac396 100644
--- a/crates/vault-registry/src/lib.rs
+++ b/crates/vault-registry/src/lib.rs
@@ -643,6 +643,7 @@ pub mod pallet {
     pub(super) type StorageVersion<T: Config> = StorageValue<_, Version, ValueQuery, DefaultForStorageVersion>;
 
     #[pallet::genesis_config]
+    #[derive(frame_support::DefaultNoBound)]
     pub struct GenesisConfig<T: Config> {
         pub minimum_collateral_vault: Vec<(CurrencyId<T>, BalanceOf<T>)>,
         pub punishment_delay: T::BlockNumber,
@@ -652,20 +653,6 @@ pub mod pallet {
         pub liquidation_collateral_threshold: Vec<(DefaultVaultCurrencyPair<T>, UnsignedFixedPoint<T>)>,
     }
 
-    #[cfg(feature = "std")]
-    impl<T: Config> Default for GenesisConfig<T> {
-        fn default() -> Self {
-            Self {
-                minimum_collateral_vault: Default::default(),
-                punishment_delay: Default::default(),
-                system_collateral_ceiling: Default::default(),
-                secure_collateral_threshold: Default::default(),
-                premium_redeem_threshold: Default::default(),
-                liquidation_collateral_threshold: Default::default(),
-            }
-        }
-    }
-
     #[pallet::genesis_build]
     impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
         fn build(&self) {
diff --git a/parachain/runtime/common/src/lib.rs b/parachain/runtime/common/src/lib.rs
index a39590d6bb..f2b5e6c7f9 100644
--- a/parachain/runtime/common/src/lib.rs
+++ b/parachain/runtime/common/src/lib.rs
@@ -96,16 +96,16 @@ where
 }
 
 pub struct AndBarrier<T: ShouldExecute, U: ShouldExecute>(PhantomData<(T, U)>);
-
+use xcm_executor::traits::Properties;
 impl<T: ShouldExecute, U: ShouldExecute> ShouldExecute for AndBarrier<T, U> {
     fn should_execute<Call>(
         origin: &MultiLocation,
         instructions: &mut [Instruction<Call>],
         max_weight: Weight,
-        weight_credit: &mut Weight,
+        properties: &mut Properties,
     ) -> Result<(), ProcessMessageError> {
-        T::should_execute(origin, instructions, max_weight, weight_credit)?;
-        U::should_execute(origin, instructions, max_weight, weight_credit)?;
+        T::should_execute(origin, instructions, max_weight, properties)?;
+        U::should_execute(origin, instructions, max_weight, properties)?;
         // only if both returned ok, we return ok
         Ok(())
     }
@@ -118,7 +118,7 @@ impl<T: ShouldExecute> ShouldExecute for Transactless<T> {
         origin: &MultiLocation,
         instructions: &mut [Instruction<Call>],
         max_weight: Weight,
-        weight_credit: &mut Weight,
+        properties: &mut Properties,
     ) -> Result<(), ProcessMessageError> {
         // filter any outer-level Transacts. Any Transact calls sent to other chain should still work.
         let has_transact = instructions.iter().any(|x| matches!(x, Instruction::Transact { .. }));
@@ -126,7 +126,7 @@ impl<T: ShouldExecute> ShouldExecute for Transactless<T> {
             return Err(ProcessMessageError::Unsupported);
         }
         // No transact - return result of the wrapped barrier
-        T::should_execute(origin, instructions, max_weight, weight_credit)
+        T::should_execute(origin, instructions, max_weight, properties)
     }
 }
 
diff --git a/parachain/runtime/interlay/src/lib.rs b/parachain/runtime/interlay/src/lib.rs
index aa9ee24427..675c577d25 100644
--- a/parachain/runtime/interlay/src/lib.rs
+++ b/parachain/runtime/interlay/src/lib.rs
@@ -15,7 +15,7 @@ use currency::Amount;
 use frame_support::{
     dispatch::{DispatchError, DispatchResult},
     traits::{
-        ConstU32, Contains, Currency as PalletCurrency, EitherOfDiverse, EnsureOrigin, EnsureOriginWithArg,
+        ConstBool, ConstU32, Contains, Currency as PalletCurrency, EitherOfDiverse, EnsureOrigin, EnsureOriginWithArg,
         EqualPrivilegeOnly, ExistenceRequirement, Imbalance, InstanceFilter, OnUnbalanced,
     },
     weights::ConstantMultiplier,
@@ -318,6 +318,7 @@ impl pallet_aura::Config for Runtime {
     type AuthorityId = AuraId;
     type DisabledValidators = ();
     type MaxAuthorities = MaxAuthorities;
+    type AllowMultipleBlocksPerSlot = ConstBool<false>;
 }
 
 parameter_types! {
diff --git a/parachain/runtime/kintsugi/src/lib.rs b/parachain/runtime/kintsugi/src/lib.rs
index d5ed050368..63f5844145 100644
--- a/parachain/runtime/kintsugi/src/lib.rs
+++ b/parachain/runtime/kintsugi/src/lib.rs
@@ -60,7 +60,7 @@ pub use frame_support::{
     construct_runtime,
     dispatch::DispatchClass,
     parameter_types,
-    traits::{Everything, Get, KeyOwnerProofSystem, LockIdentifier, Nothing},
+    traits::{Everything, Get, KeyOwnerProofSystem, LockIdentifier, Nothing, ConstBool},
     weights::{
         constants::{RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND},
         IdentityFee, Weight,
@@ -317,6 +317,7 @@ impl pallet_aura::Config for Runtime {
     type AuthorityId = AuraId;
     type DisabledValidators = ();
     type MaxAuthorities = MaxAuthorities;
+    type AllowMultipleBlocksPerSlot = ConstBool<false>;
 }
 
 parameter_types! {
diff --git a/parachain/runtime/runtime-tests/Cargo.toml b/parachain/runtime/runtime-tests/Cargo.toml
index 006cb881d5..0736e9b1c7 100644
--- a/parachain/runtime/runtime-tests/Cargo.toml
+++ b/parachain/runtime/runtime-tests/Cargo.toml
@@ -50,7 +50,6 @@ pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polka
 pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 pallet-contracts = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
 pallet-contracts-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
-
 frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 
diff --git a/parachain/runtime/runtime-tests/src/setup.rs b/parachain/runtime/runtime-tests/src/setup.rs
index 018643e590..660809fec1 100644
--- a/parachain/runtime/runtime-tests/src/setup.rs
+++ b/parachain/runtime/runtime-tests/src/setup.rs
@@ -63,7 +63,7 @@ pub struct ExtBuilder {
 
 impl ExtBuilder {
     pub fn build() -> Self {
-        let mut storage = frame_system::GenesisConfig::default()
+        let mut storage = frame_system::RuntimeGenesisConfig::default()
             .build_storage::<Runtime>()
             .unwrap();
 
@@ -90,24 +90,24 @@ impl ExtBuilder {
             .chain(iter_wrapped_currencies().map(move |currency| (account_of(FAUCET), currency, 1 << 60)))
             .collect();
 
-        orml_tokens::GenesisConfig::<Runtime> { balances }
+        orml_tokens::RuntimeGenesisConfig::<Runtime> { balances }
             .assimilate_storage(&mut storage)
             .unwrap();
 
-        oracle::GenesisConfig::<Runtime> {
+        oracle::RuntimeGenesisConfig::<Runtime> {
             authorized_oracles: vec![(account_of(BOB), BoundedVec::truncate_from(BOB.to_vec()))],
             max_delay: 3600000, // one hour
         }
         .assimilate_storage(&mut storage)
         .unwrap();
 
-        pallet_sudo::GenesisConfig::<Runtime> {
+        pallet_sudo::RuntimeGenesisConfig::<Runtime> {
             key: Some(account_of(ALICE)),
         }
         .assimilate_storage(&mut storage)
         .unwrap();
 
-        btc_relay::GenesisConfig::<Runtime> {
+        btc_relay::RuntimeGenesisConfig::<Runtime> {
             bitcoin_confirmations: CONFIRMATIONS,
             parachain_confirmations: CONFIRMATIONS,
             disable_difficulty_check: true,
@@ -116,7 +116,7 @@ impl ExtBuilder {
         .assimilate_storage(&mut storage)
         .unwrap();
 
-        vault_registry::GenesisConfig::<Runtime> {
+        vault_registry::RuntimeGenesisConfig::<Runtime> {
             minimum_collateral_vault: vec![
                 (Token(DOT), 0),
                 (Token(KSM), 0),
@@ -140,14 +140,14 @@ impl ExtBuilder {
         .assimilate_storage(&mut storage)
         .unwrap();
 
-        issue::GenesisConfig::<Runtime> {
+        issue::RuntimeGenesisConfig::<Runtime> {
             issue_period: 10,
             issue_btc_dust_value: 2,
         }
         .assimilate_storage(&mut storage)
         .unwrap();
 
-        redeem::GenesisConfig::<Runtime> {
+        redeem::RuntimeGenesisConfig::<Runtime> {
             redeem_transaction_size: 400,
             redeem_period: 10,
             redeem_btc_dust_value: 1,
@@ -155,14 +155,14 @@ impl ExtBuilder {
         .assimilate_storage(&mut storage)
         .unwrap();
 
-        replace::GenesisConfig::<Runtime> {
+        replace::RuntimeGenesisConfig::<Runtime> {
             replace_period: 10,
             replace_btc_dust_value: 2,
         }
         .assimilate_storage(&mut storage)
         .unwrap();
 
-        fee::GenesisConfig::<Runtime> {
+        fee::RuntimeGenesisConfig::<Runtime> {
             issue_fee: FixedU128::checked_from_rational(15, 10000).unwrap(), // 0.15%
             issue_griefing_collateral: FixedU128::checked_from_rational(5, 100000).unwrap(), // 0.005%
             redeem_fee: FixedU128::checked_from_rational(5, 1000).unwrap(),  // 0.5%
@@ -173,14 +173,14 @@ impl ExtBuilder {
         .assimilate_storage(&mut storage)
         .unwrap();
 
-        pallet_collective::GenesisConfig::<Runtime, TechnicalCommitteeInstance> {
+        pallet_collective::RuntimeGenesisConfig::<Runtime, TechnicalCommitteeInstance> {
             members: vec![account_of(ALICE)],
             phantom: Default::default(),
         }
         .assimilate_storage(&mut storage)
         .unwrap();
 
-        supply::GenesisConfig::<Runtime> {
+        supply::RuntimeGenesisConfig::<Runtime> {
             initial_supply: token_distribution::INITIAL_ALLOCATION,
             start_height: YEARS * 5,
             inflation: FixedU128::checked_from_rational(2, 100).unwrap(), // 2%
@@ -189,7 +189,7 @@ impl ExtBuilder {
         .unwrap();
 
         GenesisBuild::<Runtime>::assimilate_storage(
-            &loans::GenesisConfig {
+            &loans::RuntimeGenesisConfig {
                 max_exchange_rate: Rate::from_inner(DEFAULT_MAX_EXCHANGE_RATE),
                 min_exchange_rate: Rate::from_inner(DEFAULT_MIN_EXCHANGE_RATE),
             },
@@ -197,8 +197,8 @@ impl ExtBuilder {
         )
         .unwrap();
 
-        <pallet_xcm::GenesisConfig as GenesisBuild<Runtime>>::assimilate_storage(
-            &pallet_xcm::GenesisConfig {
+        <pallet_xcm::RuntimeGenesisConfig as GenesisBuild<Runtime>>::assimilate_storage(
+            &pallet_xcm::RuntimeGenesisConfig {
                 safe_xcm_version: Some(2),
             },
             &mut storage,
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index f09ee2ea4d..f312fc74e8 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -44,10 +44,10 @@ sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkad
 sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
-
+fc-api = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42" }
 fc-db = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42" }
 fc-mapping-sync = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42" }
-fc-rpc = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42" }
+fc-rpc = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42", features = ["txpool"] }
 fc-rpc-core = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42" }
 fc-storage = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42" }
 fp-rpc = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42" }
\ No newline at end of file
diff --git a/rpc/src/eth.rs b/rpc/src/eth.rs
index 5e264624eb..37e946e6db 100644
--- a/rpc/src/eth.rs
+++ b/rpc/src/eth.rs
@@ -38,7 +38,7 @@ pub struct EthDeps<C, P, A: ChainApi, CT, B: BlockT> {
     /// Chain syncing service
     pub sync: Arc<SyncingService<B>>,
     /// Frontier Backend.
-    pub frontier_backend: Arc<dyn fc_db::BackendReader<B> + Send + Sync>,
+    pub frontier_backend: Arc<dyn fc_api::Backend<B> + Send + Sync>,
     /// Ethereum data access overrides.
     pub overrides: Arc<OverrideHandle<B>>,
     /// Cache for Ethereum block data.
@@ -153,13 +153,13 @@ where
         .into_rpc(),
     )?;
 
-    let tx_pool = TxPool::new(client.clone(), graph);
+    let tx_pool = TxPool::new(client.clone(), graph.clone());
     if let Some(filter_pool) = filter_pool {
         io.merge(
             EthFilter::new(
                 client.clone(),
                 frontier_backend,
-                tx_pool.clone(),
+                graph.clone(),
                 filter_pool,
                 500_usize, // max stored filters
                 max_past_logs,