diff --git a/Cargo.lock b/Cargo.lock
index 1056c7a116..aa0e6b4a1f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -272,6 +272,20 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "aquamarine"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df752953c49ce90719c7bf1fc587bc8227aed04732ea0c0f85e5397d7fdbd1a1"
+dependencies = [
+ "include_dir",
+ "itertools 0.10.5",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "arc-swap"
 version = "1.6.0"
@@ -289,6 +303,18 @@ dependencies = [
  "ark-std",
 ]
 
+[[package]]
+name = "ark-bls12-381"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+]
+
 [[package]]
 name = "ark-bw6-761"
 version = "0.4.0"
@@ -318,6 +344,18 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "ark-ed-on-bls12-381-bandersnatch"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9cde0f2aa063a2a5c28d39b47761aa102bda7c13c84fc118a61b87c7b2f785c"
+dependencies = [
+ "ark-bls12-381",
+ "ark-ec",
+ "ark-ff",
+ "ark-std",
+]
+
 [[package]]
 name = "ark-ff"
 version = "0.4.2"
@@ -374,6 +412,34 @@ dependencies = [
  "hashbrown 0.13.2",
 ]
 
+[[package]]
+name = "ark-scale"
+version = "0.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49b08346a3e38e2be792ef53ee168623c9244d968ff00cd70fb9932f6fe36393"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "parity-scale-codec",
+]
+
+[[package]]
+name = "ark-secret-scalar"
+version = "0.0.2"
+source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "ark-transcript",
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+ "zeroize",
+]
+
 [[package]]
 name = "ark-serialize"
 version = "0.4.2"
@@ -407,6 +473,19 @@ dependencies = [
  "rand 0.8.5",
 ]
 
+[[package]]
+name = "ark-transcript"
+version = "0.0.2"
+source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1"
+dependencies = [
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+ "sha3",
+]
+
 [[package]]
 name = "array-bytes"
 version = "6.1.0"
@@ -627,6 +706,28 @@ dependencies = [
  "rustc-demangle",
 ]
 
+[[package]]
+name = "bandersnatch_vrfs"
+version = "0.0.1"
+source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1"
+dependencies = [
+ "ark-bls12-381",
+ "ark-ec",
+ "ark-ed-on-bls12-381-bandersnatch",
+ "ark-ff",
+ "ark-scale",
+ "ark-serialize",
+ "ark-std",
+ "dleq_vrf",
+ "fflonk",
+ "merlin 3.0.0",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+ "ring 0.1.0",
+ "sha2 0.10.7",
+ "zeroize",
+]
+
 [[package]]
 name = "base-x"
 version = "0.2.11"
@@ -843,6 +944,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
 
+[[package]]
+name = "bs58"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896"
+dependencies = [
+ "tinyvec",
+]
+
 [[package]]
 name = "bstr"
 version = "1.6.2"
@@ -1150,6 +1260,26 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "common"
+version = "0.1.0"
+source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-poly",
+ "ark-serialize",
+ "ark-std",
+ "fflonk",
+ "merlin 3.0.0",
+]
+
+[[package]]
+name = "common-path"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101"
+
 [[package]]
 name = "concurrent-queue"
 version = "2.2.0"
@@ -1856,6 +1986,50 @@ dependencies = [
  "syn 2.0.33",
 ]
 
+[[package]]
+name = "dleq_vrf"
+version = "0.0.2"
+source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-scale",
+ "ark-secret-scalar",
+ "ark-serialize",
+ "ark-std",
+ "ark-transcript",
+ "arrayvec 0.7.4",
+ "rand_core 0.6.4",
+ "zeroize",
+]
+
+[[package]]
+name = "docify"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c69c651fd3125396ad00fca5abd4b2681708bfe486a91b81fdbeed583888756"
+dependencies = [
+ "docify_macros",
+]
+
+[[package]]
+name = "docify_macros"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50c5fd210c8f0446a9d4768cdd125a0de528f159dd71d301891f7e2b8fe40b0d"
+dependencies = [
+ "common-path",
+ "derive-syn-parse",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "syn 2.0.33",
+ "termcolor",
+ "toml 0.7.8",
+ "walkdir",
+]
+
 [[package]]
 name = "dotenvy"
 version = "0.15.7"
@@ -2377,6 +2551,7 @@ dependencies = [
  "fp-rpc",
  "fp-storage",
  "futures",
+ "hash-db 0.16.0",
  "hex",
  "jsonrpsee",
  "libsecp256k1",
@@ -2477,6 +2652,19 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "fflonk"
+version = "0.1.0"
+source = "git+https://github.com/w3f/fflonk#26a5045b24e169cffc1f9328ca83d71061145c40"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-poly",
+ "ark-serialize",
+ "ark-std",
+ "merlin 3.0.0",
+]
+
 [[package]]
 name = "fiat-crypto"
 version = "0.2.1"
@@ -2595,7 +2783,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2681,6 +2869,7 @@ dependencies = [
  "ethereum",
  "ethereum-types",
  "fp-evm",
+ "hash-db 0.16.0",
  "parity-scale-codec",
  "scale-info",
  "sp-api",
@@ -2718,7 +2907,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "frame-support",
  "frame-support-procedural",
@@ -2743,7 +2932,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "Inflector",
  "array-bytes",
@@ -2791,11 +2980,12 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "frame-support",
  "frame-system",
  "frame-try-runtime",
+ "log",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
@@ -2820,9 +3010,11 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
+ "aquamarine",
  "bitflags 1.3.2",
+ "docify",
  "environmental",
  "frame-metadata",
  "frame-support-procedural",
@@ -2834,27 +3026,31 @@ dependencies = [
  "paste",
  "scale-info",
  "serde",
+ "serde_json",
  "smallvec",
  "sp-api",
  "sp-arithmetic",
  "sp-core",
  "sp-core-hashing-proc-macro",
  "sp-debug-derive",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
+ "sp-metadata-ir",
  "sp-runtime",
  "sp-staking",
  "sp-state-machine",
  "sp-std",
  "sp-tracing",
  "sp-weights",
+ "static_assertions",
  "tt-call",
 ]
 
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "Inflector",
  "cfg-expr",
@@ -2872,7 +3068,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -2884,7 +3080,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2894,7 +3090,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "cfg-if",
  "frame-support",
@@ -2913,7 +3109,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2928,7 +3124,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2937,7 +3133,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -2986,7 +3182,6 @@ dependencies = [
  "sc-consensus-manual-seal",
  "sc-executor",
  "sc-network",
- "sc-network-common",
  "sc-network-sync",
  "sc-offchain",
  "sc-rpc",
@@ -3009,7 +3204,6 @@ dependencies = [
  "sp-state-machine",
  "sp-timestamp",
  "sp-transaction-pool",
- "sp-trie",
  "substrate-build-script-utils",
  "substrate-frame-rpc-system",
  "substrate-prometheus-endpoint",
@@ -3056,6 +3250,7 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-std",
+ "sp-storage",
  "sp-transaction-pool",
  "sp-version",
  "substrate-wasm-builder",
@@ -3754,6 +3949,25 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "include_dir"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e"
+dependencies = [
+ "include_dir_macros",
+]
+
+[[package]]
+name = "include_dir_macros"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -4211,7 +4425,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce"
 dependencies = [
- "bs58",
+ "bs58 0.4.0",
  "ed25519-dalek 2.0.0",
  "log",
  "multiaddr",
@@ -4423,7 +4637,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-identity",
  "rcgen 0.10.0",
- "ring",
+ "ring 0.16.20",
  "rustls 0.20.9",
  "thiserror",
  "webpki 0.22.1",
@@ -4873,6 +5087,18 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "merlin"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d"
+dependencies = [
+ "byteorder",
+ "keccak",
+ "rand_core 0.6.4",
+ "zeroize",
+]
+
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -5404,10 +5630,11 @@ dependencies = [
 [[package]]
 name = "pallet-aura"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "frame-support",
  "frame-system",
+ "log",
  "pallet-timestamp",
  "parity-scale-codec",
  "scale-info",
@@ -5420,7 +5647,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5434,7 +5661,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5458,7 +5685,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5690,7 +5917,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5729,7 +5956,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5743,6 +5970,7 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
+ "sp-state-machine",
  "sp-std",
  "sp-trie",
 ]
@@ -5750,7 +5978,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5765,7 +5993,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5777,13 +6005,14 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
+ "sp-storage",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5799,7 +6028,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
@@ -5815,7 +6044,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -5827,7 +6056,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6466,7 +6695,7 @@ checksum = "f31999cfc7927c4e212e60fd50934ab40e8e8bfd2d493d6095d2d306bc0764d9"
 dependencies = [
  "bytes",
  "rand 0.8.5",
- "ring",
+ "ring 0.16.20",
  "rustc-hash",
  "rustls 0.20.9",
  "slab",
@@ -6606,7 +6835,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd"
 dependencies = [
  "pem",
- "ring",
+ "ring 0.16.20",
  "time",
  "x509-parser 0.13.2",
  "yasna",
@@ -6619,7 +6848,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
 dependencies = [
  "pem",
- "ring",
+ "ring 0.16.20",
  "time",
  "yasna",
 ]
@@ -6760,6 +6989,21 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "ring"
+version = "0.1.0"
+source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-poly",
+ "ark-serialize",
+ "ark-std",
+ "common",
+ "fflonk",
+ "merlin 3.0.0",
+]
+
 [[package]]
 name = "ring"
 version = "0.16.20"
@@ -6962,7 +7206,7 @@ checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
 dependencies = [
  "base64 0.13.1",
  "log",
- "ring",
+ "ring 0.16.20",
  "sct 0.6.1",
  "webpki 0.21.4",
 ]
@@ -6974,7 +7218,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99"
 dependencies = [
  "log",
- "ring",
+ "ring 0.16.20",
  "sct 0.7.0",
  "webpki 0.22.1",
 ]
@@ -6986,7 +7230,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
 dependencies = [
  "log",
- "ring",
+ "ring 0.16.20",
  "rustls-webpki",
  "sct 0.7.0",
 ]
@@ -7018,7 +7262,7 @@ version = "0.101.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed"
 dependencies = [
- "ring",
+ "ring 0.16.20",
  "untrusted",
 ]
 
@@ -7066,7 +7310,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "log",
  "sp-core",
@@ -7077,7 +7321,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "futures",
  "futures-timer",
@@ -7100,7 +7344,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -7115,7 +7359,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "memmap2",
  "sc-chain-spec-derive",
@@ -7134,7 +7378,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -7145,7 +7389,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "array-bytes",
  "chrono",
@@ -7184,7 +7428,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "fnv",
  "futures",
@@ -7210,7 +7454,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "hash-db 0.16.0",
  "kvdb",
@@ -7236,7 +7480,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "async-trait",
  "futures",
@@ -7261,7 +7505,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "async-trait",
  "futures",
@@ -7290,7 +7534,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -7326,7 +7570,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -7339,7 +7583,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "ahash 0.8.3",
  "array-bytes",
@@ -7380,7 +7624,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-manual-seal"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -7415,7 +7659,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "async-trait",
  "futures",
@@ -7438,7 +7682,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.1",
@@ -7460,7 +7704,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "sc-allocator",
  "sp-maybe-compressed-blob",
@@ -7472,7 +7716,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -7489,7 +7733,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "ansi_term",
  "futures",
@@ -7505,7 +7749,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "array-bytes",
  "parking_lot 0.12.1",
@@ -7519,7 +7763,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "array-bytes",
  "async-channel",
@@ -7560,7 +7804,7 @@ dependencies = [
 [[package]]
 name = "sc-network-bitswap"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "async-channel",
  "cid",
@@ -7580,7 +7824,7 @@ dependencies = [
 [[package]]
 name = "sc-network-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "async-trait",
  "bitflags 1.3.2",
@@ -7597,7 +7841,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "ahash 0.8.3",
  "futures",
@@ -7615,7 +7859,7 @@ dependencies = [
 [[package]]
 name = "sc-network-light"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "array-bytes",
  "async-channel",
@@ -7636,7 +7880,7 @@ dependencies = [
 [[package]]
 name = "sc-network-sync"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "array-bytes",
  "async-channel",
@@ -7670,7 +7914,7 @@ dependencies = [
 [[package]]
 name = "sc-network-transactions"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "array-bytes",
  "futures",
@@ -7688,7 +7932,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "array-bytes",
  "bytes",
@@ -7722,7 +7966,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -7731,7 +7975,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -7762,7 +8006,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -7781,7 +8025,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "http",
  "jsonrpsee",
@@ -7796,7 +8040,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-spec-v2"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "array-bytes",
  "futures",
@@ -7809,6 +8053,7 @@ dependencies = [
  "sc-chain-spec",
  "sc-client-api",
  "sc-transaction-pool-api",
+ "sc-utils",
  "serde",
  "sp-api",
  "sp-blockchain",
@@ -7816,13 +8061,14 @@ dependencies = [
  "sp-runtime",
  "sp-version",
  "thiserror",
+ "tokio",
  "tokio-stream",
 ]
 
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "async-trait",
  "directories",
@@ -7886,7 +8132,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7897,7 +8143,7 @@ dependencies = [
 [[package]]
 name = "sc-sysinfo"
 version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "futures",
  "libc",
@@ -7916,7 +8162,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "chrono",
  "futures",
@@ -7935,7 +8181,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "ansi_term",
  "atty",
@@ -7964,7 +8210,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -7975,7 +8221,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "async-trait",
  "futures",
@@ -8001,7 +8247,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "async-trait",
  "futures",
@@ -8017,7 +8263,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "async-channel",
  "futures",
@@ -8085,7 +8331,7 @@ dependencies = [
  "arrayvec 0.5.2",
  "curve25519-dalek 2.1.3",
  "getrandom 0.1.16",
- "merlin",
+ "merlin 2.0.1",
  "rand 0.7.3",
  "rand_core 0.5.1",
  "sha2 0.8.2",
@@ -8111,7 +8357,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
 dependencies = [
- "ring",
+ "ring 0.16.20",
  "untrusted",
 ]
 
@@ -8121,7 +8367,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
 dependencies = [
- "ring",
+ "ring 0.16.20",
  "untrusted",
 ]
 
@@ -8450,7 +8696,7 @@ dependencies = [
  "chacha20poly1305",
  "curve25519-dalek 4.1.0",
  "rand_core 0.6.4",
- "ring",
+ "ring 0.16.20",
  "rustc_version",
  "sha2 0.10.7",
  "subtle",
@@ -8496,7 +8742,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "hash-db 0.16.0",
  "log",
@@ -8517,7 +8763,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "Inflector",
  "blake2",
@@ -8531,7 +8777,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -8544,7 +8790,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "16.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -8558,7 +8804,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "sp-api",
  "sp-inherents",
@@ -8569,7 +8815,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "futures",
  "log",
@@ -8587,7 +8833,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "async-trait",
  "futures",
@@ -8602,7 +8848,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -8619,7 +8865,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -8638,7 +8884,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -8656,7 +8902,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -8668,13 +8914,15 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "21.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "array-bytes",
+ "arrayvec 0.7.4",
+ "bandersnatch_vrfs",
  "bitflags 1.3.2",
  "blake2",
  "bounded-collections",
- "bs58",
+ "bs58 0.5.0",
  "dyn-clonable",
  "ed25519-zebra",
  "futures",
@@ -8684,7 +8932,7 @@ dependencies = [
  "lazy_static",
  "libsecp256k1",
  "log",
- "merlin",
+ "merlin 2.0.1",
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "paste",
@@ -8713,7 +8961,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing"
 version = "9.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "blake2b_simd",
  "byteorder",
@@ -8726,7 +8974,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing-proc-macro"
 version = "9.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "quote",
  "sp-core-hashing",
@@ -8736,7 +8984,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.1",
@@ -8745,7 +8993,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "8.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8755,7 +9003,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.19.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8763,10 +9011,21 @@ dependencies = [
  "sp-storage",
 ]
 
+[[package]]
+name = "sp-genesis-builder"
+version = "0.1.0"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
+dependencies = [
+ "serde_json",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -8780,11 +9039,10 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "bytes",
- "ed25519 1.5.3",
- "ed25519-dalek 1.0.1",
+ "ed25519-dalek 2.0.0",
  "libsecp256k1",
  "log",
  "parity-scale-codec",
@@ -8805,7 +9063,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "24.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -8816,7 +9074,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.27.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.1",
@@ -8828,7 +9086,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "thiserror",
  "zstd 0.12.4",
@@ -8837,7 +9095,7 @@ dependencies = [
 [[package]]
 name = "sp-metadata-ir"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "frame-metadata",
  "parity-scale-codec",
@@ -8848,7 +9106,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -8858,7 +9116,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "8.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -8868,7 +9126,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -8878,7 +9136,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "24.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -8900,7 +9158,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "17.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -8918,7 +9176,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -8930,7 +9188,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -8945,7 +9203,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8959,7 +9217,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.28.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "hash-db 0.16.0",
  "log",
@@ -8980,10 +9238,16 @@ dependencies = [
 [[package]]
 name = "sp-statement-store"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
+ "aes-gcm 0.10.2",
+ "curve25519-dalek 4.1.0",
+ "ed25519-dalek 2.0.0",
+ "hkdf",
  "parity-scale-codec",
+ "rand 0.8.5",
  "scale-info",
+ "sha2 0.10.7",
  "sp-api",
  "sp-application-crypto",
  "sp-core",
@@ -8992,17 +9256,18 @@ dependencies = [
  "sp-runtime-interface",
  "sp-std",
  "thiserror",
+ "x25519-dalek 2.0.0",
 ]
 
 [[package]]
 name = "sp-std"
 version = "8.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 
 [[package]]
 name = "sp-storage"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9015,7 +9280,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -9028,7 +9293,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "10.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -9040,7 +9305,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -9049,7 +9314,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -9064,7 +9329,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "22.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "ahash 0.8.3",
  "hash-db 0.16.0",
@@ -9087,7 +9352,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "22.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9104,7 +9369,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "8.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -9115,7 +9380,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "anyhow",
  "impl-trait-for-tuples",
@@ -9128,7 +9393,7 @@ dependencies = [
 [[package]]
 name = "sp-weights"
 version = "20.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -9390,7 +9655,7 @@ dependencies = [
  "lazy_static",
  "md-5",
  "rand 0.8.5",
- "ring",
+ "ring 0.16.20",
  "subtle",
  "thiserror",
  "tokio",
@@ -9427,12 +9692,12 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures",
@@ -9451,7 +9716,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "hyper",
  "log",
@@ -9463,7 +9728,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "array-bytes",
  "async-trait",
@@ -9489,7 +9754,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "array-bytes",
  "frame-executive",
@@ -9503,6 +9768,8 @@ dependencies = [
  "parity-scale-codec",
  "sc-service",
  "scale-info",
+ "serde",
+ "serde_json",
  "sp-api",
  "sp-application-crypto",
  "sp-block-builder",
@@ -9511,6 +9778,7 @@ dependencies = [
  "sp-consensus-grandpa",
  "sp-core",
  "sp-externalities",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-keyring",
@@ -9529,7 +9797,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime-client"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "futures",
  "sc-block-builder",
@@ -9547,7 +9815,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d"
+source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=cem-upgrade-to-polkadot-1.1.0#893898cb26c2d279877288f6cf67799905c7cca0"
 dependencies = [
  "ansi_term",
  "build-helper",
@@ -10149,7 +10417,7 @@ dependencies = [
  "log",
  "md-5",
  "rand 0.8.5",
- "ring",
+ "ring 0.16.20",
  "stun",
  "thiserror",
  "tokio",
@@ -10448,9 +10716,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt"
-version = "0.112.0"
+version = "0.114.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87fef6d0d508f08334e0ab0e6877feb4c0ecb3956bcf2cb950699b22fedf3e9c"
+checksum = "4d005a95f934878a1fb446a816d51c3601a0120ff929005ba3bab3c749cfd1c7"
 dependencies = [
  "anyhow",
  "libc",
@@ -10464,9 +10732,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt-cxx-sys"
-version = "0.112.0"
+version = "0.114.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc816bbc1596c8f2e8127e137a760c798023ef3d378f2ae51f0f1840e2dfa445"
+checksum = "6d04e240598162810fad3b2e96fa0dec6dba1eb65a03f3bd99a9248ab8b56caa"
 dependencies = [
  "anyhow",
  "cxx",
@@ -10476,9 +10744,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt-sys"
-version = "0.112.0"
+version = "0.114.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40199e4f68ef1071b3c6d0bd8026a12b481865d4b9e49c156932ea9a6234dd14"
+checksum = "2efd2aaca519d64098c4faefc8b7433a97ed511caf4c9e516384eb6aef1ff4f9"
 dependencies = [
  "anyhow",
  "cc",
@@ -10722,7 +10990,7 @@ version = "0.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
 dependencies = [
- "ring",
+ "ring 0.16.20",
  "untrusted",
 ]
 
@@ -10732,7 +11000,7 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e"
 dependencies = [
- "ring",
+ "ring 0.16.20",
  "untrusted",
 ]
 
@@ -10761,7 +11029,7 @@ dependencies = [
  "rand 0.8.5",
  "rcgen 0.9.3",
  "regex",
- "ring",
+ "ring 0.16.20",
  "rtcp",
  "rtp",
  "rustls 0.19.1",
@@ -10825,7 +11093,7 @@ dependencies = [
  "rand 0.8.5",
  "rand_core 0.6.4",
  "rcgen 0.10.0",
- "ring",
+ "ring 0.16.20",
  "rustls 0.19.1",
  "sec1 0.3.0",
  "serde",
@@ -11260,7 +11528,7 @@ dependencies = [
  "lazy_static",
  "nom",
  "oid-registry 0.4.0",
- "ring",
+ "ring 0.16.20",
  "rusticata-macros",
  "thiserror",
  "time",
diff --git a/Cargo.toml b/Cargo.toml
index f4bc98696e..d0249a5755 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,6 +47,7 @@ ethereum = { version = "0.14.0", default-features = false }
 ethereum-types = { version = "0.14.1", default-features = false }
 evm = { git = "https://github.com/moonbeam-foundation/evm", rev = "a33ac87ad7462b7e7029d12c385492b2a8311d1c", default-features = false }
 futures = "0.3.28"
+hash-db = { version = "0.16.0", default-features = false }
 hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
 hex-literal = "0.4.1"
 impl-serde = { version = "0.4.0", default-features = false }
@@ -65,75 +66,75 @@ sqlx = { version = "0.7.1", default-features = false, features = ["macros"] }
 thiserror = "1.0"
 tokio = "1.29.1"
 # Substrate Client
-sc-basic-authorship = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sc-block-builder = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sc-chain-spec = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sc-cli = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-sc-client-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sc-client-db = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-sc-consensus = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sc-consensus-aura = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sc-consensus-grandpa = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sc-consensus-manual-seal = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sc-executor = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sc-keystore = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sc-network = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sc-network-common = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sc-network-sync = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sc-offchain = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sc-rpc = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sc-service = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sc-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sc-utils = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+sc-basic-authorship = { version = "0.10.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sc-block-builder = { version = "0.10.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sc-chain-spec = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sc-cli = { version = "0.10.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+sc-client-api = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sc-client-db = { version = "0.10.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+sc-consensus = { version = "0.10.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sc-consensus-aura = { version = "0.10.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sc-consensus-grandpa = { version = "0.10.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sc-consensus-manual-seal = { version = "0.10.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sc-executor = { version = "0.10.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sc-keystore = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sc-network = { version = "0.10.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sc-network-common = { version = "0.10.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sc-network-sync = { version = "0.10.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sc-offchain = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sc-rpc = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sc-service = { version = "0.10.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sc-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sc-utils = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
 # Substrate Primitive
-sp-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sp-consensus = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sp-consensus-aura = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-sp-consensus-grandpa = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-sp-core = { version = "21.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-sp-database = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sp-inherents = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-sp-io = { version = "23.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-sp-keyring = { version = "24.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-sp-offchain = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-sp-runtime = { version = "24.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-sp-runtime-interface = { version = "17.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-sp-session = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-sp-state-machine = { version = "0.28.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-sp-std = { version = "8.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-sp-storage = { version = "13.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-sp-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-sp-trie = { version = "22.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-sp-version = { version = "22.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+sp-api = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sp-consensus = { version = "0.10.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sp-consensus-aura = { version = "0.10.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+sp-consensus-grandpa = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+sp-core = { version = "21.0.0", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+sp-database = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sp-inherents = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+sp-io = { version = "23.0.0", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+sp-keyring = { version = "24.0.0", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+sp-offchain = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+sp-runtime = { version = "24.0.0", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+sp-runtime-interface = { version = "17.0.0", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+sp-session = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+sp-state-machine = { version = "0.28.0", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+sp-std = { version = "8.0.0", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+sp-storage = { version = "13.0.0", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+sp-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+sp-trie = { version = "22.0.0", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+sp-version = { version = "22.0.0", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
 # Substrate FRAME
-frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-frame-executive = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-frame-support = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-frame-system = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-frame-system-benchmarking = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-frame-system-rpc-runtime-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-pallet-aura = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-pallet-balances = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-pallet-grandpa = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-pallet-sudo = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-pallet-timestamp = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-pallet-transaction-payment = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-pallet-transaction-payment-rpc = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-pallet-transaction-payment-rpc-runtime-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
-pallet-utility = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
+frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+frame-executive = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+frame-support = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+frame-system = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+frame-system-benchmarking = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+frame-system-rpc-runtime-api = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+pallet-aura = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+pallet-balances = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+pallet-grandpa = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+pallet-sudo = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+pallet-timestamp = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+pallet-transaction-payment = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+pallet-transaction-payment-rpc = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+pallet-transaction-payment-rpc-runtime-api = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
+pallet-utility = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0", default-features = false }
 # Substrate Utility
-frame-benchmarking-cli = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-substrate-build-script-utils = { version = "3.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-substrate-frame-rpc-system = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-substrate-test-runtime-client = { version = "2.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
-substrate-wasm-builder = { version = "5.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
+frame-benchmarking-cli = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.10.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+substrate-build-script-utils = { version = "3.0.0", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+substrate-frame-rpc-system = { version = "4.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+substrate-test-runtime-client = { version = "2.0.0", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
+substrate-wasm-builder = { version = "5.0.0-dev", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "cem-upgrade-to-polkadot-1.1.0" }
 # Frontier Client
 fc-cli = { version = "1.0.0-dev", path = "client/cli", default-features = false }
 fc-consensus = { version = "2.0.0-dev", path = "client/consensus" }
diff --git a/client/consensus/src/lib.rs b/client/consensus/src/lib.rs
index d58bd722db..440908d171 100644
--- a/client/consensus/src/lib.rs
+++ b/client/consensus/src/lib.rs
@@ -80,7 +80,7 @@ impl<Block: BlockT, I: Clone + BlockImport<Block>, C> Clone for FrontierBlockImp
 impl<B, I, C> FrontierBlockImport<B, I, C>
 where
 	B: BlockT,
-	I: BlockImport<B, Transaction = sp_api::TransactionFor<C, B>>,
+	I: BlockImport<B>,
 	I::Error: Into<ConsensusError>,
 	C: ProvideRuntimeApi<B>,
 	C::Api: BlockBuilderApi<B> + EthereumRuntimeRPCApi<B>,
@@ -98,13 +98,12 @@ where
 impl<B, I, C> BlockImport<B> for FrontierBlockImport<B, I, C>
 where
 	B: BlockT,
-	I: BlockImport<B, Transaction = sp_api::TransactionFor<C, B>> + Send + Sync,
+	I: BlockImport<B> + Send + Sync,
 	I::Error: Into<ConsensusError>,
 	C: ProvideRuntimeApi<B> + Send + Sync,
 	C::Api: BlockBuilderApi<B> + EthereumRuntimeRPCApi<B>,
 {
 	type Error = ConsensusError;
-	type Transaction = sp_api::TransactionFor<C, B>;
 
 	async fn check_block(
 		&mut self,
@@ -115,7 +114,7 @@ where
 
 	async fn import_block(
 		&mut self,
-		block: BlockImportParams<B, Self::Transaction>,
+		block: BlockImportParams<B>,
 	) -> Result<ImportResult, Self::Error> {
 		// We validate that there are only one frontier log. No other
 		// actions are needed and mapping syncing is delegated to a separate
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index b0c87cb148..19ec7ac51e 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -15,6 +15,7 @@ ethereum = { workspace = true, features = ["with-codec"] }
 ethereum-types = { workspace = true }
 evm = { workspace = true }
 futures = { workspace = true }
+hash-db = { workspace = true }
 hex = { workspace = true }
 jsonrpsee = { workspace = true, features = ["server", "macros"] }
 libsecp256k1 = { workspace = true }
diff --git a/client/rpc/src/eth/execute.rs b/client/rpc/src/eth/execute.rs
index 6858bfda38..31e813fcbe 100644
--- a/client/rpc/src/eth/execute.rs
+++ b/client/rpc/src/eth/execute.rs
@@ -20,6 +20,7 @@ use std::{cell::RefCell, collections::BTreeMap, sync::Arc};
 
 use ethereum_types::{H160, H256, U256};
 use evm::{ExitError, ExitReason};
+use hash_db::Hasher;
 use jsonrpsee::core::RpcResult;
 use scale_codec::{Decode, Encode};
 // Substrate
@@ -27,7 +28,6 @@ use sc_client_api::backend::{Backend, StorageProvider};
 use sc_transaction_pool::ChainApi;
 use sp_api::{
 	ApiExt, CallApiAt, CallApiAtParams, CallContext, Extensions, ProvideRuntimeApi,
-	StorageTransactionCache,
 };
 use sp_block_builder::BlockBuilder as BlockBuilderApi;
 use sp_blockchain::HeaderBackend;
@@ -241,14 +241,11 @@ where
 						api_version,
 						state_overrides,
 					)?;
-					let storage_transaction_cache =
-						RefCell::<StorageTransactionCache<B, C::StateBackend>>::default();
 					let params = CallApiAtParams {
 						at: substrate_hash,
 						function: "EthereumRuntimeRPCApi_call",
 						arguments: encoded_params,
 						overlayed_changes: &RefCell::new(overlayed_changes),
-						storage_transaction_cache: &storage_transaction_cache,
 						call_context: CallContext::Offchain,
 						recorder: &None,
 						extensions: &RefCell::new(Extensions::new()),
@@ -883,12 +880,12 @@ where
 
 	/// Given an address mapped `CallStateOverride`, creates `OverlayedChanges` to be used for
 	/// `CallApiAt` eth_call.
-	fn create_overrides_overlay(
+	fn create_overrides_overlay<H: Hasher>(
 		&self,
 		block_hash: B::Hash,
 		api_version: u32,
 		state_overrides: Option<BTreeMap<H160, CallStateOverride>>,
-	) -> RpcResult<OverlayedChanges> {
+	) -> RpcResult<OverlayedChanges<H>> {
 		let mut overlayed_changes = OverlayedChanges::default();
 		if let Some(state_overrides) = state_overrides {
 			for (address, state_override) in state_overrides {
diff --git a/client/rpc/src/lib.rs b/client/rpc/src/lib.rs
index 7c56bdc610..56f148fc8c 100644
--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -61,6 +61,7 @@ pub mod frontier_backend_client {
 	use super::internal_err;
 
 	use ethereum_types::{H160, H256, U256};
+	use hash_db::Hasher;
 	use jsonrpsee::core::RpcResult;
 	use scale_codec::Encode;
 	// Substrate
@@ -93,9 +94,9 @@ pub mod frontier_backend_client {
 			true
 		}
 
-		fn set_overlayed_changes(
+		fn set_overlayed_changes<H: Hasher>(
 			client: &C,
-			overlayed_changes: &mut OverlayedChanges,
+			overlayed_changes: &mut OverlayedChanges<H>,
 			block: B::Hash,
 			_version: u32,
 			address: H160,
@@ -146,9 +147,9 @@ pub mod frontier_backend_client {
 			true
 		}
 
-		fn set_overlayed_changes(
+		fn set_overlayed_changes<H: Hasher>(
 			client: &C,
-			overlayed_changes: &mut OverlayedChanges,
+			overlayed_changes: &mut OverlayedChanges<H>,
 			block: B::Hash,
 			_version: u32,
 			address: H160,
diff --git a/frame/ethereum/src/lib.rs b/frame/ethereum/src/lib.rs
index 9b933bd0ee..b2d43bb205 100644
--- a/frame/ethereum/src/lib.rs
+++ b/frame/ethereum/src/lib.rs
@@ -44,14 +44,14 @@ use fp_evm::{
 };
 use fp_storage::{EthereumStorageSchema, PALLET_ETHEREUM_SCHEMA};
 use frame_support::{
-	codec::{Decode, Encode, MaxEncodedLen},
 	dispatch::{DispatchInfo, DispatchResultWithPostInfo, Pays, PostDispatchInfo},
-	scale_info::TypeInfo,
+	pallet_prelude::TypeInfo,
 	traits::{EnsureOrigin, Get, PalletInfoAccess, Time},
 	weights::Weight,
 };
 use frame_system::{pallet_prelude::OriginFor, CheckWeight, WeightInfo};
 use pallet_evm::{BlockHashMapping, FeeCalculator, GasWeightMapping, Runner};
+use scale_codec::{Decode, Encode, MaxEncodedLen};
 use sp_runtime::{
 	generic::DigestItem,
 	traits::{DispatchInfoOf, Dispatchable, One, Saturating, UniqueSaturatedInto, Zero},
diff --git a/frame/ethereum/src/mock.rs b/frame/ethereum/src/mock.rs
index 42ecd33b5d..61a4f2df7d 100644
--- a/frame/ethereum/src/mock.rs
+++ b/frame/ethereum/src/mock.rs
@@ -19,7 +19,6 @@
 
 use ethereum::{TransactionAction, TransactionSignature};
 use frame_support::{
-	dispatch::Dispatchable,
 	parameter_types,
 	traits::{ConstU32, FindAuthor},
 	weights::Weight,
diff --git a/frame/evm/precompile/dispatch/Cargo.toml b/frame/evm/precompile/dispatch/Cargo.toml
index 06ab329ce9..9c9e2f6c82 100644
--- a/frame/evm/precompile/dispatch/Cargo.toml
+++ b/frame/evm/precompile/dispatch/Cargo.toml
@@ -13,6 +13,8 @@ frame-support = { workspace = true }
 # Frontier
 fp-evm = { workspace = true }
 pallet-evm = { workspace = true }
+sp-runtime = { workspace = true }
+scale-codec = { package = "parity-scale-codec", workspace = true }
 
 [dev-dependencies]
 scale-codec = { package = "parity-scale-codec", workspace = true }
diff --git a/frame/evm/precompile/dispatch/src/lib.rs b/frame/evm/precompile/dispatch/src/lib.rs
index d3427b692f..b573d60183 100644
--- a/frame/evm/precompile/dispatch/src/lib.rs
+++ b/frame/evm/precompile/dispatch/src/lib.rs
@@ -27,14 +27,15 @@ mod mock;
 mod tests;
 
 use alloc::format;
+use scale_codec::{Decode, DecodeLimit};
+use sp_runtime::traits::Dispatchable;
 use core::marker::PhantomData;
 use fp_evm::{
 	ExitError, ExitSucceed, Precompile, PrecompileFailure, PrecompileHandle, PrecompileOutput,
 	PrecompileResult,
 };
 use frame_support::{
-	codec::{Decode, DecodeLimit as _},
-	dispatch::{DispatchClass, Dispatchable, GetDispatchInfo, Pays, PostDispatchInfo},
+	dispatch::{DispatchClass, GetDispatchInfo, Pays, PostDispatchInfo},
 	traits::{ConstU32, Get},
 };
 use pallet_evm::{AddressMapping, GasWeightMapping};
diff --git a/frame/evm/src/benchmarking.rs b/frame/evm/src/benchmarking.rs
index 8ee4280100..a2aab2c0d2 100644
--- a/frame/evm/src/benchmarking.rs
+++ b/frame/evm/src/benchmarking.rs
@@ -33,7 +33,7 @@ benchmarks! {
 
 		let x in 1..10000000;
 
-		use frame_benchmarking::vec;
+		use sp_std::vec;
 		use rlp::RlpStream;
 		use sp_core::{H160, U256};
 
diff --git a/frame/evm/src/lib.rs b/frame/evm/src/lib.rs
index 323ad141f1..f6df9bac3a 100644
--- a/frame/evm/src/lib.rs
+++ b/frame/evm/src/lib.rs
@@ -72,7 +72,8 @@ use impl_trait_for_tuples::impl_for_tuples;
 use scale_info::TypeInfo;
 // Substrate
 use frame_support::{
-	dispatch::{DispatchResultWithPostInfo, MaxEncodedLen, Pays, PostDispatchInfo},
+	dispatch::{DispatchResultWithPostInfo, Pays, PostDispatchInfo},
+	pallet_prelude::MaxEncodedLen,
 	traits::{
 		tokens::{
 			currency::Currency,
diff --git a/primitives/rpc/Cargo.toml b/primitives/rpc/Cargo.toml
index 5850c5e9e3..06590e0088 100644
--- a/primitives/rpc/Cargo.toml
+++ b/primitives/rpc/Cargo.toml
@@ -13,6 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 ethereum = { workspace = true, features = ["with-codec"] }
 ethereum-types = { workspace = true }
+hash-db = { workspace = true }
 scale-codec = { package = "parity-scale-codec", workspace = true }
 scale-info = { workspace = true }
 # Substrate
diff --git a/primitives/rpc/src/lib.rs b/primitives/rpc/src/lib.rs
index 045402fdf5..c78b70010c 100644
--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -21,6 +21,7 @@
 
 use ethereum::Log;
 use ethereum_types::Bloom;
+use hash_db::Hasher;
 use scale_codec::{Decode, Encode};
 use scale_info::TypeInfo;
 // Substrate
@@ -49,9 +50,9 @@ pub struct TxPoolResponse {
 pub trait RuntimeStorageOverride<B: BlockT, C>: Send + Sync {
 	fn is_enabled() -> bool;
 
-	fn set_overlayed_changes(
+	fn set_overlayed_changes<H: Hasher>(
 		client: &C,
-		overlayed_changes: &mut OverlayedChanges,
+		overlayed_changes: &mut OverlayedChanges<H>,
 		block: B::Hash,
 		version: u32,
 		address: H160,
@@ -67,9 +68,9 @@ impl<B: BlockT, C> RuntimeStorageOverride<B, C> for () {
 		false
 	}
 
-	fn set_overlayed_changes(
+	fn set_overlayed_changes<H: Hasher>(
 		_client: &C,
-		_overlayed_changes: &mut OverlayedChanges,
+		_overlayed_changes: &mut OverlayedChanges<H>,
 		_block: B::Hash,
 		_version: u32,
 		_address: H160,
diff --git a/template/node/Cargo.toml b/template/node/Cargo.toml
index 4acaec944b..497f51127a 100644
--- a/template/node/Cargo.toml
+++ b/template/node/Cargo.toml
@@ -34,7 +34,6 @@ sc-consensus-grandpa = { workspace = true }
 sc-consensus-manual-seal = { workspace = true }
 sc-executor = { workspace = true }
 sc-network = { workspace = true }
-sc-network-common = { workspace = true }
 sc-network-sync = { workspace = true }
 sc-offchain = { workspace = true }
 sc-rpc = { workspace = true }
@@ -56,7 +55,6 @@ sp-session = { workspace = true, features = ["default"] }
 sp-state-machine = { workspace = true, features = ["default"] }
 sp-timestamp = { workspace = true, features = ["default"] }
 sp-transaction-pool = { workspace = true, features = ["default"] }
-sp-trie = { workspace = true, features = ["default"] }
 # These dependencies are used for RPC
 frame-system-rpc-runtime-api = { workspace = true }
 pallet-transaction-payment-rpc = { workspace = true }
diff --git a/template/node/src/client.rs b/template/node/src/client.rs
index 7d9d1c227c..29f9c10946 100644
--- a/template/node/src/client.rs
+++ b/template/node/src/client.rs
@@ -1,7 +1,6 @@
 // Substrate
 use sc_executor::{NativeElseWasmExecutor, NativeExecutionDispatch, NativeVersion};
 use sp_consensus_aura::sr25519::AuthorityId as AuraId;
-use sp_runtime::traits::BlakeTwo256;
 // Local
 use frontier_template_runtime::{opaque::Block, AccountId, Balance, Nonce};
 
@@ -43,8 +42,6 @@ pub trait BaseRuntimeApiCollection:
 	+ sp_offchain::OffchainWorkerApi<Block>
 	+ sp_session::SessionKeys<Block>
 	+ sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>
-where
-	<Self as sp_api::ApiExt<Block>>::StateBackend: sp_api::StateBackend<BlakeTwo256>,
 {
 }
 
@@ -56,7 +53,6 @@ where
 		+ sp_offchain::OffchainWorkerApi<Block>
 		+ sp_session::SessionKeys<Block>
 		+ sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>,
-	<Self as sp_api::ApiExt<Block>>::StateBackend: sp_api::StateBackend<BlakeTwo256>,
 {
 }
 
@@ -68,8 +64,6 @@ pub trait RuntimeApiCollection:
 	+ sp_consensus_grandpa::GrandpaApi<Block>
 	+ frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Nonce>
 	+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>
-where
-	<Self as sp_api::ApiExt<Block>>::StateBackend: sp_api::StateBackend<BlakeTwo256>,
 {
 }
 
@@ -81,6 +75,5 @@ where
 		+ sp_consensus_grandpa::GrandpaApi<Block>
 		+ frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Nonce>
 		+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>,
-	<Self as sp_api::ApiExt<Block>>::StateBackend: sp_api::StateBackend<BlakeTwo256>,
 {
 }
diff --git a/template/node/src/eth.rs b/template/node/src/eth.rs
index 33b451ac8d..6eb125b6d7 100644
--- a/template/node/src/eth.rs
+++ b/template/node/src/eth.rs
@@ -7,12 +7,11 @@ use std::{
 
 use futures::{future, prelude::*};
 // Substrate
-use sc_client_api::{BlockchainEvents, StateBackendFor};
+use sc_client_api::BlockchainEvents;
 use sc_executor::NativeExecutionDispatch;
 use sc_network_sync::SyncingService;
 use sc_service::{error::Error as ServiceError, Configuration, TaskManager};
 use sp_api::ConstructRuntimeApi;
-use sp_runtime::traits::BlakeTwo256;
 // Frontier
 pub use fc_consensus::FrontierBlockImport;
 use fc_rpc::{EthTask, OverrideHandle};
@@ -113,8 +112,6 @@ pub trait EthCompatRuntimeApiCollection:
 	sp_api::ApiExt<Block>
 	+ fp_rpc::ConvertTransactionRuntimeApi<Block>
 	+ fp_rpc::EthereumRuntimeRPCApi<Block>
-where
-	<Self as sp_api::ApiExt<Block>>::StateBackend: sp_api::StateBackend<BlakeTwo256>,
 {
 }
 
@@ -123,7 +120,6 @@ where
 	Api: sp_api::ApiExt<Block>
 		+ fp_rpc::ConvertTransactionRuntimeApi<Block>
 		+ fp_rpc::EthereumRuntimeRPCApi<Block>,
-	<Self as sp_api::ApiExt<Block>>::StateBackend: sp_api::StateBackend<BlakeTwo256>,
 {
 }
 
@@ -146,7 +142,7 @@ pub async fn spawn_frontier_tasks<RuntimeApi, Executor>(
 	RuntimeApi: ConstructRuntimeApi<Block, FullClient<RuntimeApi, Executor>>,
 	RuntimeApi: Send + Sync + 'static,
 	RuntimeApi::RuntimeApi:
-		EthCompatRuntimeApiCollection<StateBackend = StateBackendFor<FullBackend, Block>>,
+		EthCompatRuntimeApiCollection,
 	Executor: NativeExecutionDispatch + 'static,
 {
 	// Spawn main mapping sync worker background task.
diff --git a/template/node/src/service.rs b/template/node/src/service.rs
index 24e5f5ecb0..6e9fc619a0 100644
--- a/template/node/src/service.rs
+++ b/template/node/src/service.rs
@@ -5,18 +5,16 @@ use std::{cell::RefCell, path::Path, sync::Arc, time::Duration};
 use futures::{channel::mpsc, prelude::*};
 // Substrate
 use prometheus_endpoint::Registry;
-use sc_client_api::{Backend, BlockBackend, StateBackendFor};
+use sc_client_api::{Backend, BlockBackend};
 use sc_consensus::BasicQueue;
 use sc_executor::NativeExecutionDispatch;
-use sc_network_common::sync::warp::WarpSyncParams;
+use sc_network_sync::warp::WarpSyncParams;
 use sc_service::{error::Error as ServiceError, Configuration, PartialComponents, TaskManager};
 use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker};
 use sc_transaction_pool_api::OffchainTransactionPoolFactory;
-use sp_api::{ConstructRuntimeApi, TransactionFor};
+use sp_api::ConstructRuntimeApi;
 use sp_consensus_aura::sr25519::AuthorityPair as AuraPair;
 use sp_core::U256;
-use sp_runtime::traits::BlakeTwo256;
-use sp_trie::PrefixedMemoryDB;
 // Runtime
 use frontier_template_runtime::{opaque::Block, Hash, TransactionConverter};
 
@@ -33,14 +31,18 @@ pub use crate::{
 	eth::{db_config_dir, EthConfiguration},
 };
 
-type BasicImportQueue<Client> = sc_consensus::DefaultImportQueue<Block, Client>;
+type BasicImportQueue = sc_consensus::DefaultImportQueue<Block>;
 type FullPool<Client> = sc_transaction_pool::FullPool<Block, Client>;
 type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;
 
 type GrandpaBlockImport<Client> =
 	sc_consensus_grandpa::GrandpaBlockImport<FullBackend, Block, Client, FullSelectChain>;
 type GrandpaLinkHalf<Client> = sc_consensus_grandpa::LinkHalf<Block, Client, FullSelectChain>;
-type BoxBlockImport<Client> = sc_consensus::BoxBlockImport<Block, TransactionFor<Client, Block>>;
+type BoxBlockImport = sc_consensus::BoxBlockImport<Block>;
+
+/// The minimum period of blocks on which justifications will be
+/// imported and generated.
+const GRANDPA_JUSTIFICATION_PERIOD: u32 = 512;
 
 pub fn new_partial<RuntimeApi, Executor, BIQ>(
 	config: &Configuration,
@@ -51,11 +53,11 @@ pub fn new_partial<RuntimeApi, Executor, BIQ>(
 		FullClient<RuntimeApi, Executor>,
 		FullBackend,
 		FullSelectChain,
-		BasicImportQueue<FullClient<RuntimeApi, Executor>>,
+		BasicImportQueue,
 		FullPool<FullClient<RuntimeApi, Executor>>,
 		(
 			Option<Telemetry>,
-			BoxBlockImport<FullClient<RuntimeApi, Executor>>,
+			BoxBlockImport,
 			GrandpaLinkHalf<FullClient<RuntimeApi, Executor>>,
 			FrontierBackend,
 			Arc<fc_rpc::OverrideHandle<Block>>,
@@ -66,8 +68,8 @@ pub fn new_partial<RuntimeApi, Executor, BIQ>(
 where
 	RuntimeApi: ConstructRuntimeApi<Block, FullClient<RuntimeApi, Executor>>,
 	RuntimeApi: Send + Sync + 'static,
-	RuntimeApi::RuntimeApi: BaseRuntimeApiCollection<StateBackend = StateBackendFor<FullBackend, Block>>
-		+ EthCompatRuntimeApiCollection<StateBackend = StateBackendFor<FullBackend, Block>>,
+	RuntimeApi::RuntimeApi: BaseRuntimeApiCollection
+		+ EthCompatRuntimeApiCollection,
 	Executor: NativeExecutionDispatch + 'static,
 	BIQ: FnOnce(
 		Arc<FullClient<RuntimeApi, Executor>>,
@@ -78,8 +80,8 @@ where
 		GrandpaBlockImport<FullClient<RuntimeApi, Executor>>,
 	) -> Result<
 		(
-			BasicImportQueue<FullClient<RuntimeApi, Executor>>,
-			BoxBlockImport<FullClient<RuntimeApi, Executor>>,
+			BasicImportQueue,
+			BoxBlockImport,
 		),
 		ServiceError,
 	>,
@@ -115,6 +117,7 @@ where
 	let select_chain = sc_consensus::LongestChain::new(backend.clone());
 	let (grandpa_block_import, grandpa_link) = sc_consensus_grandpa::block_import(
 		client.clone(),
+		GRANDPA_JUSTIFICATION_PERIOD,
 		&client,
 		select_chain.clone(),
 		telemetry.as_ref().map(|x| x.handle()),
@@ -195,8 +198,8 @@ pub fn build_aura_grandpa_import_queue<RuntimeApi, Executor>(
 	grandpa_block_import: GrandpaBlockImport<FullClient<RuntimeApi, Executor>>,
 ) -> Result<
 	(
-		BasicImportQueue<FullClient<RuntimeApi, Executor>>,
-		BoxBlockImport<FullClient<RuntimeApi, Executor>>,
+		BasicImportQueue,
+		BoxBlockImport,
 	),
 	ServiceError,
 >
@@ -204,7 +207,7 @@ where
 	RuntimeApi: ConstructRuntimeApi<Block, FullClient<RuntimeApi, Executor>>,
 	RuntimeApi: Send + Sync + 'static,
 	RuntimeApi::RuntimeApi:
-		RuntimeApiCollection<StateBackend = StateBackendFor<FullBackend, Block>>,
+		RuntimeApiCollection,
 	Executor: NativeExecutionDispatch + 'static,
 {
 	let frontier_block_import =
@@ -251,8 +254,8 @@ pub fn build_manual_seal_import_queue<RuntimeApi, Executor>(
 	_grandpa_block_import: GrandpaBlockImport<FullClient<RuntimeApi, Executor>>,
 ) -> Result<
 	(
-		BasicImportQueue<FullClient<RuntimeApi, Executor>>,
-		BoxBlockImport<FullClient<RuntimeApi, Executor>>,
+		BasicImportQueue,
+		BoxBlockImport,
 	),
 	ServiceError,
 >
@@ -260,7 +263,7 @@ where
 	RuntimeApi: ConstructRuntimeApi<Block, FullClient<RuntimeApi, Executor>>,
 	RuntimeApi: Send + Sync + 'static,
 	RuntimeApi::RuntimeApi:
-		RuntimeApiCollection<StateBackend = StateBackendFor<FullBackend, Block>>,
+		RuntimeApiCollection,
 	Executor: NativeExecutionDispatch + 'static,
 {
 	let frontier_block_import = FrontierBlockImport::new(client.clone(), client);
@@ -284,7 +287,7 @@ where
 	RuntimeApi: ConstructRuntimeApi<Block, FullClient<RuntimeApi, Executor>>,
 	RuntimeApi: Send + Sync + 'static,
 	RuntimeApi::RuntimeApi:
-		RuntimeApiCollection<StateBackend = StateBackendFor<FullBackend, Block>>,
+		RuntimeApiCollection,
 	Executor: NativeExecutionDispatch + 'static,
 {
 	let build_import_queue = if sealing.is_some() {
@@ -574,7 +577,7 @@ where
 		let grandpa_config = sc_consensus_grandpa::Config {
 			// FIXME #1578 make this available through chainspec
 			gossip_duration: Duration::from_millis(333),
-			justification_period: 512,
+			justification_generation_period: 512,
 			name: Some(name),
 			observer_enabled: false,
 			keystore,
@@ -619,7 +622,7 @@ fn run_manual_seal_authorship<RuntimeApi, Executor>(
 	client: Arc<FullClient<RuntimeApi, Executor>>,
 	transaction_pool: Arc<FullPool<FullClient<RuntimeApi, Executor>>>,
 	select_chain: FullSelectChain,
-	block_import: BoxBlockImport<FullClient<RuntimeApi, Executor>>,
+	block_import: BoxBlockImport,
 	task_manager: &TaskManager,
 	prometheus_registry: Option<&Registry>,
 	telemetry: Option<&Telemetry>,
@@ -629,7 +632,7 @@ where
 	RuntimeApi: ConstructRuntimeApi<Block, FullClient<RuntimeApi, Executor>>,
 	RuntimeApi: Send + Sync + 'static,
 	RuntimeApi::RuntimeApi:
-		RuntimeApiCollection<StateBackend = StateBackendFor<FullBackend, Block>>,
+		RuntimeApiCollection,
 	Executor: NativeExecutionDispatch + 'static,
 {
 	let proposer_factory = sc_basic_authorship::ProposerFactory::new(
@@ -726,7 +729,7 @@ pub fn new_chain_ops(
 	(
 		Arc<Client>,
 		Arc<FullBackend>,
-		BasicQueue<Block, PrefixedMemoryDB<BlakeTwo256>>,
+		BasicQueue<Block>,
 		TaskManager,
 		FrontierBackend,
 	),
diff --git a/template/runtime/Cargo.toml b/template/runtime/Cargo.toml
index 5547dee3b9..6aa715d832 100644
--- a/template/runtime/Cargo.toml
+++ b/template/runtime/Cargo.toml
@@ -25,6 +25,7 @@ sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
 sp-std = { workspace = true }
+sp-storage = { workspace = true }
 sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true }
 # Substrate FRAME
diff --git a/template/runtime/src/lib.rs b/template/runtime/src/lib.rs
index df88dc285d..b8c25248f2 100644
--- a/template/runtime/src/lib.rs
+++ b/template/runtime/src/lib.rs
@@ -232,6 +232,8 @@ impl pallet_grandpa::Config for Runtime {
 
 	type KeyOwnerProof = sp_core::Void;
 	type EquivocationReportSystem = ();
+
+	type MaxNominators = ();
 }
 
 parameter_types! {
@@ -977,7 +979,8 @@ impl_runtime_apis! {
 		fn dispatch_benchmark(
 			config: frame_benchmarking::BenchmarkConfig
 		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
-			use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};
+			use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch, add_benchmark};
+			use sp_storage::TrackedStorageKey;
 
 			use pallet_evm::Pallet as PalletEvmBench;
 			use pallet_hotfix_sufficients::Pallet as PalletHotfixSufficientsBench;
@@ -988,7 +991,7 @@ impl_runtime_apis! {
 			let whitelist: Vec<TrackedStorageKey> = vec![];
 
 			let mut batches = Vec::<BenchmarkBatch>::new();
-			let params = (&config, &whitelist);
+			let params = (&config, &whitelist[..]);
 
 			add_benchmark!(params, batches, pallet_evm, PalletEvmBench::<Runtime>);
 			add_benchmark!(params, batches, pallet_hotfix_sufficients, PalletHotfixSufficientsBench::<Runtime>);