diff --git a/Cargo.lock b/Cargo.lock
index be2025379e..27664447ba 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -493,7 +493,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "array-bytes 4.2.0",
  "async-trait",
@@ -527,7 +527,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "beefy-gadget",
  "futures",
@@ -544,13 +544,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "beefy-merkle-tree"
+name = "binary-merkle-tree"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
- "sp-api",
- "sp-beefy",
- "sp-runtime",
+ "hash-db",
+ "log",
 ]
 
 [[package]]
@@ -706,11 +705,23 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
 
+[[package]]
+name = "bounded-collections"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a071c348a5ef6da1d3a87166b408170b46002382b1dda83992b5c2208cefb370"
+dependencies = [
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+]
+
 [[package]]
 name = "bounded-vec"
-version = "0.6.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3372be4090bf9d4da36bd8ba7ce6ca1669503d0cf6e667236c6df7f053153eb6"
+checksum = "68534a48cbf63a4b1323c433cf21238c9ec23711e0df13b08c33e5c2082663ce"
 dependencies = [
  "thiserror",
 ]
@@ -758,6 +769,12 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 
+[[package]]
+name = "bytemuck"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
+
 [[package]]
 name = "byteorder"
 version = "1.4.3"
@@ -801,15 +818,16 @@ dependencies = [
 
 [[package]]
 name = "cargo_metadata"
-version = "0.14.2"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa"
+checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
 dependencies = [
  "camino",
  "cargo-platform",
  "semver 1.0.17",
  "serde",
  "serde_json",
+ "thiserror",
 ]
 
 [[package]]
@@ -1115,18 +1133,18 @@ dependencies = [
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.88.2"
+version = "0.93.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52056f6d0584484b57fa6c1a65c1fcb15f3780d8b6a758426d9e3084169b2ddd"
+checksum = "a7379abaacee0f14abf3204a7606118f0465785252169d186337bcb75030815a"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.88.2"
+version = "0.93.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fed94c8770dc25d01154c3ffa64ed0b3ba9d583736f305fed7beebe5d9cf74"
+checksum = "9489fa336927df749631f1008007ced2871068544f40a202ce6d93fbf2366a7b"
 dependencies = [
  "arrayvec 0.7.2",
  "bumpalo",
@@ -1136,6 +1154,7 @@ dependencies = [
  "cranelift-entity",
  "cranelift-isle",
  "gimli 0.26.2",
+ "hashbrown 0.12.3",
  "log",
  "regalloc2",
  "smallvec",
@@ -1144,33 +1163,33 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.88.2"
+version = "0.93.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c451b81faf237d11c7e4f3165eeb6bac61112762c5cfe7b4c0fb7241474358f"
+checksum = "05bbb67da91ec721ed57cef2f7c5ef7728e1cd9bde9ffd3ef8601022e73e3239"
 dependencies = [
  "cranelift-codegen-shared",
 ]
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.88.2"
+version = "0.93.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7c940133198426d26128f08be2b40b0bd117b84771fd36798969c4d712d81fc"
+checksum = "418ecb2f36032f6665dc1a5e2060a143dbab41d83b784882e97710e890a7a16d"
 
 [[package]]
 name = "cranelift-entity"
-version = "0.88.2"
+version = "0.93.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352"
+checksum = "7cf583f7b093f291005f9fb1323e2c37f6ee4c7909e39ce016b2e8360d461705"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.88.2"
+version = "0.93.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34897538b36b216cc8dd324e73263596d51b8cf610da6498322838b2546baf8a"
+checksum = "0b66bf9e916f57fbbd0f7703ec6286f4624866bf45000111627c70d272c8dda1"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -1180,15 +1199,15 @@ dependencies = [
 
 [[package]]
 name = "cranelift-isle"
-version = "0.88.2"
+version = "0.93.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b2629a569fae540f16a76b70afcc87ad7decb38dc28fa6c648ac73b51e78470"
+checksum = "649782a39ce99798dd6b4029e2bb318a2fbeaade1b4fa25330763c10c65bc358"
 
 [[package]]
 name = "cranelift-native"
-version = "0.88.2"
+version = "0.93.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20937dab4e14d3e225c5adfc9c7106bafd4ac669bdb43027b911ff794c6fb318"
+checksum = "937e021e089c51f9749d09e7ad1c4f255c2f8686cb8c3df63a34b3ec9921bc41"
 dependencies = [
  "cranelift-codegen",
  "libc",
@@ -1197,9 +1216,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-wasm"
-version = "0.88.2"
+version = "0.93.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80fc2288957a94fd342a015811479de1837850924166d1f1856d8406e6f3609b"
+checksum = "d850cf6775477747c9dfda9ae23355dd70512ffebc70cf82b85a5b111ae668b5"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1377,7 +1396,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-cli"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "clap",
  "parity-scale-codec",
@@ -1392,7 +1411,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-collator"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "cumulus-client-consensus-common",
  "cumulus-client-network",
@@ -1415,7 +1434,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-consensus-aura"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "async-trait",
  "cumulus-client-consensus-common",
@@ -1444,7 +1463,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-consensus-common"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "async-trait",
  "cumulus-client-pov-recovery",
@@ -1457,6 +1476,7 @@ dependencies = [
  "polkadot-primitives",
  "sc-client-api",
  "sc-consensus",
+ "schnellru",
  "sp-blockchain",
  "sp-consensus",
  "sp-runtime",
@@ -1467,7 +1487,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-network"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "async-trait",
  "cumulus-relay-chain-interface",
@@ -1490,8 +1510,9 @@ dependencies = [
 [[package]]
 name = "cumulus-client-pov-recovery"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
+ "async-trait",
  "cumulus-primitives-core",
  "cumulus-relay-chain-interface",
  "futures",
@@ -1513,11 +1534,12 @@ dependencies = [
 [[package]]
 name = "cumulus-client-service"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "cumulus-client-cli",
  "cumulus-client-collator",
  "cumulus-client-consensus-common",
+ "cumulus-client-network",
  "cumulus-client-pov-recovery",
  "cumulus-primitives-core",
  "cumulus-relay-chain-inprocess-interface",
@@ -1528,20 +1550,26 @@ dependencies = [
  "polkadot-primitives",
  "sc-client-api",
  "sc-consensus",
+ "sc-network",
+ "sc-network-transactions",
+ "sc-rpc",
  "sc-service",
  "sc-sysinfo",
  "sc-telemetry",
+ "sc-transaction-pool",
+ "sc-utils",
  "sp-api",
  "sp-blockchain",
  "sp-consensus",
  "sp-core",
  "sp-runtime",
+ "sp-transaction-pool",
 ]
 
 [[package]]
 name = "cumulus-pallet-aura-ext"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1557,7 +1585,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-dmp-queue"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -1574,7 +1602,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-parachain-system"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "bytes",
  "cumulus-pallet-parachain-system-proc-macro",
@@ -1603,7 +1631,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-parachain-system-proc-macro"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -1614,7 +1642,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-session-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1628,7 +1656,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-xcm"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -1644,7 +1672,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-xcmp-queue"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "cumulus-primitives-core",
  "frame-benchmarking",
@@ -1665,7 +1693,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-core"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "parity-scale-codec",
  "polkadot-core-primitives",
@@ -1681,7 +1709,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-parachain-inherent"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -1704,7 +1732,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-timestamp"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "cumulus-primitives-core",
  "futures",
@@ -1717,7 +1745,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-utility"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -1735,7 +1763,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-inprocess-interface"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -1760,7 +1788,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-interface"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -1768,6 +1796,7 @@ dependencies = [
  "jsonrpsee-core",
  "parity-scale-codec",
  "polkadot-overseer",
+ "polkadot-service",
  "sc-client-api",
  "sp-api",
  "sp-blockchain",
@@ -1779,7 +1808,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-minimal-node"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "array-bytes 6.0.0",
  "async-trait",
@@ -1819,7 +1848,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-rpc-interface"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -1848,7 +1877,7 @@ dependencies = [
 [[package]]
 name = "cumulus-test-relay-sproof-builder"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "cumulus-primitives-core",
  "parity-scale-codec",
@@ -2127,7 +2156,7 @@ dependencies = [
  "convert_case",
  "proc-macro2",
  "quote",
- "rustc_version 0.4.0",
+ "rustc_version",
  "syn 1.0.109",
 ]
 
@@ -2653,7 +2682,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2676,7 +2705,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-support",
  "frame-support-procedural",
@@ -2701,7 +2730,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "Inflector",
  "array-bytes 4.2.0",
@@ -2748,7 +2777,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-solution-type"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -2759,7 +2788,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-election-provider-solution-type",
  "frame-support",
@@ -2776,7 +2805,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2805,7 +2834,7 @@ dependencies = [
 [[package]]
 name = "frame-remote-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "futures",
  "log",
@@ -2821,7 +2850,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "bitflags 1.3.2",
  "frame-metadata",
@@ -2853,7 +2882,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "Inflector",
  "cfg-expr",
@@ -2868,7 +2897,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -2880,7 +2909,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2890,7 +2919,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-support",
  "log",
@@ -2908,7 +2937,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2923,7 +2952,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2932,7 +2961,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3637,12 +3666,6 @@ dependencies = [
  "webrtc-util",
 ]
 
-[[package]]
-name = "io-lifetimes"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074"
-
 [[package]]
 name = "io-lifetimes"
 version = "1.0.8"
@@ -3685,8 +3708,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e"
 dependencies = [
  "hermit-abi 0.3.1",
- "io-lifetimes 1.0.8",
- "rustix 0.36.10",
+ "io-lifetimes",
+ "rustix",
  "windows-sys 0.45.0",
 ]
 
@@ -3994,8 +4017,8 @@ dependencies = [
 
 [[package]]
 name = "kusama-runtime"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -4045,6 +4068,7 @@ dependencies = [
  "pallet-session-benchmarking",
  "pallet-society",
  "pallet-staking",
+ "pallet-staking-runtime-api",
  "pallet-timestamp",
  "pallet-tips",
  "pallet-transaction-payment",
@@ -4091,8 +4115,8 @@ dependencies = [
 
 [[package]]
 name = "kusama-runtime-constants"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -4730,20 +4754,13 @@ dependencies = [
 
 [[package]]
 name = "linregress"
-version = "0.4.4"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6c601a85f5ecd1aba625247bca0031585fb1c446461b142878a16f8245ddeb8"
+checksum = "475015a7f8f017edb28d2e69813be23500ad4b32cfe3421c4148efc97324ee52"
 dependencies = [
  "nalgebra",
- "statrs",
 ]
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.0.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.1.4"
@@ -4897,7 +4914,6 @@ dependencies = [
  "pallet-indices",
  "pallet-multisig",
  "pallet-proxy",
- "pallet-randomness-collective-flip",
  "pallet-session",
  "pallet-sudo",
  "pallet-timestamp",
@@ -4974,7 +4990,7 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb"
 dependencies = [
- "rustix 0.36.10",
+ "rustix",
 ]
 
 [[package]]
@@ -5082,7 +5098,7 @@ dependencies = [
 [[package]]
 name = "mmr-gadget"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "futures",
  "log",
@@ -5101,7 +5117,7 @@ dependencies = [
 [[package]]
 name = "mmr-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "anyhow",
  "jsonrpsee",
@@ -5254,9 +5270,9 @@ dependencies = [
 
 [[package]]
 name = "nalgebra"
-version = "0.27.1"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "462fffe4002f4f2e1f6a9dcf12cc1a6fc0e15989014efc02a941d3e0f5dc2120"
+checksum = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511"
 dependencies = [
  "approx",
  "matrixmultiply",
@@ -5264,17 +5280,15 @@ dependencies = [
  "num-complex",
  "num-rational",
  "num-traits",
- "rand 0.8.5",
- "rand_distr",
  "simba",
  "typenum",
 ]
 
 [[package]]
 name = "nalgebra-macros"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218"
+checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5469,7 +5483,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
 dependencies = [
  "autocfg",
- "libm 0.2.6",
 ]
 
 [[package]]
@@ -5627,7 +5640,7 @@ dependencies = [
 [[package]]
 name = "pallet-aura"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5643,7 +5656,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5659,7 +5672,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5673,7 +5686,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5697,7 +5710,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5717,7 +5730,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5732,26 +5745,29 @@ dependencies = [
 [[package]]
 name = "pallet-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-support",
  "frame-system",
+ "pallet-authorship",
  "pallet-session",
  "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-beefy",
  "sp-runtime",
+ "sp-session",
+ "sp-staking",
  "sp-std",
 ]
 
 [[package]]
 name = "pallet-beefy-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "array-bytes 4.2.0",
- "beefy-merkle-tree",
+ "binary-merkle-tree",
  "frame-support",
  "frame-system",
  "log",
@@ -5761,6 +5777,7 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
+ "sp-api",
  "sp-beefy",
  "sp-core",
  "sp-io",
@@ -5771,7 +5788,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5789,7 +5806,7 @@ dependencies = [
 [[package]]
 name = "pallet-child-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5808,7 +5825,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5825,7 +5842,7 @@ dependencies = [
 [[package]]
 name = "pallet-conviction-voting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -5842,7 +5859,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5887,7 +5904,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5910,7 +5927,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-support-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5923,7 +5940,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5941,7 +5958,7 @@ dependencies = [
 [[package]]
 name = "pallet-fast-unstake"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5959,7 +5976,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5982,7 +5999,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -5998,7 +6015,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6018,7 +6035,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6051,7 +6068,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6068,7 +6085,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6085,7 +6102,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6101,7 +6118,7 @@ dependencies = [
 [[package]]
 name = "pallet-nis"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6117,7 +6134,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6134,7 +6151,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-benchmarking"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -6154,8 +6171,9 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-runtime-api"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
+ "pallet-nomination-pools",
  "parity-scale-codec",
  "sp-api",
  "sp-std",
@@ -6164,7 +6182,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6181,7 +6199,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -6205,7 +6223,7 @@ dependencies = [
 [[package]]
 name = "pallet-preimage"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6222,7 +6240,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6234,24 +6252,10 @@ dependencies = [
  "sp-std",
 ]
 
-[[package]]
-name = "pallet-randomness-collective-flip"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
-dependencies = [
- "frame-support",
- "frame-system",
- "parity-scale-codec",
- "safe-mix",
- "scale-info",
- "sp-runtime",
- "sp-std",
-]
-
 [[package]]
 name = "pallet-ranked-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6269,7 +6273,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6284,7 +6288,7 @@ dependencies = [
 [[package]]
 name = "pallet-referenda"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -6303,7 +6307,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6320,7 +6324,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6341,7 +6345,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6357,7 +6361,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6371,7 +6375,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -6394,7 +6398,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -6405,16 +6409,25 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "log",
  "sp-arithmetic",
 ]
 
+[[package]]
+name = "pallet-staking-runtime-api"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "parity-scale-codec",
+ "sp-api",
+]
+
 [[package]]
 name = "pallet-state-trie-migration"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6431,7 +6444,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6445,7 +6458,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6463,7 +6476,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6482,7 +6495,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6498,7 +6511,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
@@ -6514,7 +6527,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -6526,7 +6539,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6543,7 +6556,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6559,7 +6572,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6592,7 +6605,7 @@ dependencies = [
 [[package]]
 name = "pallet-whitelist"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6606,9 +6619,10 @@ dependencies = [
 
 [[package]]
 name = "pallet-xcm"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
+ "bounded-collections",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -6626,8 +6640,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-xcm-benchmarks"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6646,7 +6660,7 @@ dependencies = [
 [[package]]
 name = "parachain-info"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.39#d6eef144421ef5c3f339f681484d06bb729dfa82"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -6889,7 +6903,6 @@ dependencies = [
  "pallet-multisig",
  "pallet-preimage",
  "pallet-proxy",
- "pallet-randomness-collective-flip",
  "pallet-scheduler",
  "pallet-session",
  "pallet-sudo",
@@ -7049,8 +7062,8 @@ checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630"
 
 [[package]]
 name = "polkadot-approval-distribution"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "futures",
  "polkadot-node-metrics",
@@ -7064,8 +7077,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-availability-bitfield-distribution"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "futures",
  "polkadot-node-network-protocol",
@@ -7078,8 +7091,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-availability-distribution"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "derive_more",
  "fatality",
@@ -7101,8 +7114,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-availability-recovery"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "fatality",
  "futures",
@@ -7122,8 +7135,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-cli"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "clap",
  "frame-benchmarking-cli",
@@ -7150,8 +7163,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-client"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "async-trait",
  "frame-benchmarking",
@@ -7192,8 +7205,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-collator-protocol"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "always-assert",
  "bitvec",
@@ -7214,8 +7227,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-core-primitives"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -7226,8 +7239,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-dispute-distribution"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "derive_more",
  "fatality",
@@ -7251,8 +7264,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-erasure-coding"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-primitives",
@@ -7265,8 +7278,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-gossip-support"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "futures",
  "futures-timer",
@@ -7285,8 +7298,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-network-bridge"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "always-assert",
  "async-trait",
@@ -7309,8 +7322,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-collation-generation"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "futures",
  "parity-scale-codec",
@@ -7327,8 +7340,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-approval-voting"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "bitvec",
  "derive_more",
@@ -7356,8 +7369,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-av-store"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "bitvec",
  "futures",
@@ -7370,14 +7383,15 @@ dependencies = [
  "polkadot-node-subsystem-util",
  "polkadot-overseer",
  "polkadot-primitives",
+ "sp-consensus",
  "thiserror",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-node-core-backing"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "bitvec",
  "fatality",
@@ -7395,8 +7409,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-bitfield-signing"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "futures",
  "polkadot-node-subsystem",
@@ -7410,8 +7424,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-candidate-validation"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "async-trait",
  "futures",
@@ -7421,6 +7435,7 @@ dependencies = [
  "polkadot-node-metrics",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
+ "polkadot-node-subsystem-util",
  "polkadot-parachain",
  "polkadot-primitives",
  "sp-maybe-compressed-blob",
@@ -7429,8 +7444,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-chain-api"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "futures",
  "polkadot-node-metrics",
@@ -7444,8 +7459,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-chain-selection"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "futures",
  "futures-timer",
@@ -7461,8 +7476,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-dispute-coordinator"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "fatality",
  "futures",
@@ -7480,8 +7495,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-parachains-inherent"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "async-trait",
  "futures",
@@ -7497,8 +7512,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-provisioner"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "bitvec",
  "fatality",
@@ -7515,19 +7530,22 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-pvf"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "always-assert",
  "assert_matches",
  "cpu-time",
  "futures",
  "futures-timer",
+ "libc",
  "parity-scale-codec",
  "pin-project",
  "polkadot-core-primitives",
  "polkadot-node-metrics",
+ "polkadot-node-primitives",
  "polkadot-parachain",
+ "polkadot-primitives",
  "rand 0.8.5",
  "rayon",
  "sc-executor",
@@ -7541,14 +7559,15 @@ dependencies = [
  "sp-tracing",
  "sp-wasm-interface",
  "tempfile",
+ "tikv-jemalloc-ctl",
  "tokio",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-node-core-pvf-checker"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "futures",
  "polkadot-node-primitives",
@@ -7563,8 +7582,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-runtime-api"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "futures",
  "lru 0.9.0",
@@ -7578,8 +7597,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-jaeger"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "lazy_static",
  "log",
@@ -7596,8 +7615,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-metrics"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "bs58",
  "futures",
@@ -7615,8 +7634,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-network-protocol"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7638,8 +7657,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-primitives"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "bounded-vec",
  "futures",
@@ -7654,14 +7673,15 @@ dependencies = [
  "sp-core",
  "sp-keystore",
  "sp-maybe-compressed-blob",
+ "sp-runtime",
  "thiserror",
  "zstd",
 ]
 
 [[package]]
 name = "polkadot-node-subsystem"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-node-subsystem-types",
@@ -7670,8 +7690,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-subsystem-types"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7693,8 +7713,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-subsystem-util"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7726,8 +7746,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-overseer"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "async-trait",
  "futures",
@@ -7749,9 +7769,10 @@ dependencies = [
 
 [[package]]
 name = "polkadot-parachain"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
+ "bounded-collections",
  "derive_more",
  "frame-support",
  "parity-scale-codec",
@@ -7765,8 +7786,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-performance-test"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "env_logger 0.9.3",
  "kusama-runtime",
@@ -7774,14 +7795,15 @@ dependencies = [
  "polkadot-erasure-coding",
  "polkadot-node-core-pvf",
  "polkadot-node-primitives",
+ "polkadot-primitives",
  "quote",
  "thiserror",
 ]
 
 [[package]]
 name = "polkadot-primitives"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "bitvec",
  "hex-literal",
@@ -7806,8 +7828,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-rpc"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "beefy-gadget",
  "beefy-gadget-rpc",
@@ -7838,8 +7860,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -7883,6 +7905,7 @@ dependencies = [
  "pallet-session-benchmarking",
  "pallet-staking",
  "pallet-staking-reward-curve",
+ "pallet-staking-runtime-api",
  "pallet-timestamp",
  "pallet-tips",
  "pallet-transaction-payment",
@@ -7927,8 +7950,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-common"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -7940,7 +7963,6 @@ dependencies = [
  "log",
  "pallet-authorship",
  "pallet-babe",
- "pallet-bags-list",
  "pallet-balances",
  "pallet-beefy-mmr",
  "pallet-election-provider-multi-phase",
@@ -7976,8 +7998,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-constants"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -7990,8 +8012,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-metrics"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "bs58",
  "parity-scale-codec",
@@ -8002,8 +8024,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-parachains"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "bitflags 1.3.2",
  "bitvec",
@@ -8021,6 +8043,7 @@ dependencies = [
  "pallet-timestamp",
  "pallet-vesting",
  "parity-scale-codec",
+ "polkadot-parachain",
  "polkadot-primitives",
  "polkadot-runtime-metrics",
  "rand 0.8.5",
@@ -8045,8 +8068,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-service"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "async-trait",
  "beefy-gadget",
@@ -8153,8 +8176,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-statement-distribution"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "arrayvec 0.5.2",
  "fatality",
@@ -8174,8 +8197,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-statement-table"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
@@ -8604,16 +8627,6 @@ dependencies = [
  "getrandom 0.2.8",
 ]
 
-[[package]]
-name = "rand_distr"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
-dependencies = [
- "num-traits",
- "rand 0.8.5",
-]
-
 [[package]]
 name = "rand_hc"
 version = "0.2.0"
@@ -8740,9 +8753,9 @@ dependencies = [
 
 [[package]]
 name = "regalloc2"
-version = "0.3.2"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d43a209257d978ef079f3d446331d0f1794f5e0fc19b306a199983857833a779"
+checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c"
 dependencies = [
  "fxhash",
  "log",
@@ -8776,6 +8789,18 @@ version = "0.6.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
 
+[[package]]
+name = "region"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e"
+dependencies = [
+ "bitflags 1.3.2",
+ "libc",
+ "mach",
+ "winapi",
+]
+
 [[package]]
 name = "resolv-conf"
 version = "0.7.0"
@@ -8824,10 +8849,10 @@ dependencies = [
 
 [[package]]
 name = "rococo-runtime"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
- "beefy-merkle-tree",
+ "binary-merkle-tree",
  "frame-benchmarking",
  "frame-executive",
  "frame-support",
@@ -8910,8 +8935,8 @@ dependencies = [
 
 [[package]]
 name = "rococo-runtime-constants"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -9038,15 +9063,6 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
 
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver 0.9.0",
-]
-
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
@@ -9065,20 +9081,6 @@ dependencies = [
  "nom",
 ]
 
-[[package]]
-name = "rustix"
-version = "0.35.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9"
-dependencies = [
- "bitflags 1.3.2",
- "errno",
- "io-lifetimes 0.7.5",
- "libc",
- "linux-raw-sys 0.0.46",
- "windows-sys 0.42.0",
-]
-
 [[package]]
 name = "rustix"
 version = "0.36.10"
@@ -9087,9 +9089,9 @@ checksum = "2fe885c3a125aa45213b68cc1472a49880cb5923dc23f522ad2791b882228778"
 dependencies = [
  "bitflags 1.3.2",
  "errno",
- "io-lifetimes 1.0.8",
+ "io-lifetimes",
  "libc",
- "linux-raw-sys 0.1.4",
+ "linux-raw-sys",
  "windows-sys 0.45.0",
 ]
 
@@ -9163,12 +9165,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
 
 [[package]]
-name = "safe-mix"
-version = "1.0.1"
+name = "safe_arch"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d3d055a2582e6b00ed7a31c1524040aa391092bf636328350813f3a0605215c"
+checksum = "794821e4ccb0d9f979512f9c1973480123f9bd62a90d74ab0f9426fcf8f4a529"
 dependencies = [
- "rustc_version 0.2.3",
+ "bytemuck",
 ]
 
 [[package]]
@@ -9183,7 +9185,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "log",
  "sp-core",
@@ -9194,7 +9196,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "async-trait",
  "futures",
@@ -9221,7 +9223,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "futures",
  "futures-timer",
@@ -9244,7 +9246,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -9260,7 +9262,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "memmap2",
  "sc-chain-spec-derive",
@@ -9275,7 +9277,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -9286,7 +9288,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "array-bytes 4.2.0",
  "chrono",
@@ -9326,7 +9328,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "fnv",
  "futures",
@@ -9352,7 +9354,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -9378,7 +9380,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "async-trait",
  "futures",
@@ -9403,7 +9405,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "async-trait",
  "futures",
@@ -9432,7 +9434,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -9450,6 +9452,7 @@ dependencies = [
  "sc-consensus-slots",
  "sc-keystore",
  "sc-telemetry",
+ "scale-info",
  "schnorrkel",
  "sp-api",
  "sp-application-crypto",
@@ -9470,7 +9473,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -9492,7 +9495,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -9505,7 +9508,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "async-trait",
  "futures",
@@ -9528,7 +9531,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "lru 0.8.1",
  "parity-scale-codec",
@@ -9552,7 +9555,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "sc-allocator",
  "sp-maybe-compressed-blob",
@@ -9565,7 +9568,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "log",
  "sc-allocator",
@@ -9578,13 +9581,14 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
+ "anyhow",
  "cfg-if",
  "libc",
  "log",
  "once_cell",
- "rustix 0.35.13",
+ "rustix",
  "sc-allocator",
  "sc-executor-common",
  "sp-runtime-interface",
@@ -9595,7 +9599,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "ahash 0.8.3",
  "array-bytes 4.2.0",
@@ -9635,7 +9639,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "finality-grandpa",
  "futures",
@@ -9655,7 +9659,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "ansi_term",
  "futures",
@@ -9670,7 +9674,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "array-bytes 4.2.0",
  "async-trait",
@@ -9685,7 +9689,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "array-bytes 4.2.0",
  "async-trait",
@@ -9700,6 +9704,7 @@ dependencies = [
  "libp2p",
  "log",
  "lru 0.8.1",
+ "mockall",
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "pin-project",
@@ -9727,7 +9732,7 @@ dependencies = [
 [[package]]
 name = "sc-network-bitswap"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "cid",
  "futures",
@@ -9746,7 +9751,7 @@ dependencies = [
 [[package]]
 name = "sc-network-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "async-trait",
  "bitflags 1.3.2",
@@ -9772,7 +9777,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "ahash 0.8.3",
  "futures",
@@ -9790,7 +9795,7 @@ dependencies = [
 [[package]]
 name = "sc-network-light"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "array-bytes 4.2.0",
  "futures",
@@ -9811,7 +9816,7 @@ dependencies = [
 [[package]]
 name = "sc-network-sync"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "array-bytes 4.2.0",
  "async-trait",
@@ -9843,7 +9848,7 @@ dependencies = [
 [[package]]
 name = "sc-network-transactions"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "array-bytes 4.2.0",
  "futures",
@@ -9862,7 +9867,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "array-bytes 4.2.0",
  "bytes",
@@ -9892,7 +9897,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "futures",
  "libp2p",
@@ -9905,7 +9910,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -9914,7 +9919,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -9944,7 +9949,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -9963,7 +9968,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "http",
  "jsonrpsee",
@@ -9978,7 +9983,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-spec-v2"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "array-bytes 4.2.0",
  "futures",
@@ -10004,7 +10009,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "async-trait",
  "directories",
@@ -10070,7 +10075,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -10081,7 +10086,7 @@ dependencies = [
 [[package]]
 name = "sc-storage-monitor"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "clap",
  "futures",
@@ -10097,7 +10102,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -10116,7 +10121,7 @@ dependencies = [
 [[package]]
 name = "sc-sysinfo"
 version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "futures",
  "libc",
@@ -10135,7 +10140,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "chrono",
  "futures",
@@ -10154,7 +10159,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "ansi_term",
  "atty",
@@ -10185,7 +10190,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -10196,7 +10201,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "async-trait",
  "futures",
@@ -10223,7 +10228,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "async-trait",
  "futures",
@@ -10237,7 +10242,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "backtrace",
  "futures",
@@ -10429,15 +10434,6 @@ dependencies = [
  "semver-parser",
 ]
 
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
 [[package]]
 name = "semver"
 version = "1.0.17"
@@ -10590,14 +10586,15 @@ dependencies = [
 
 [[package]]
 name = "simba"
-version = "0.5.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e82063457853d00243beda9952e910b82593e4b07ae9f721b9278a99a0d3d5c"
+checksum = "50582927ed6f77e4ac020c057f37a268fc6aebc29225050365aacbb9deeeddc4"
 dependencies = [
  "approx",
  "num-complex",
  "num-traits",
  "paste",
+ "wide",
 ]
 
 [[package]]
@@ -10623,8 +10620,8 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec"
 
 [[package]]
 name = "slot-range-helper"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "enumn",
  "parity-scale-codec",
@@ -10666,7 +10663,7 @@ dependencies = [
  "curve25519-dalek 4.0.0-rc.1",
  "rand_core 0.6.4",
  "ring",
- "rustc_version 0.4.0",
+ "rustc_version",
  "sha2 0.10.6",
  "subtle",
 ]
@@ -10701,7 +10698,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "hash-db",
  "log",
@@ -10719,7 +10716,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "blake2",
  "proc-macro-crate",
@@ -10731,7 +10728,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10744,7 +10741,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -10758,7 +10755,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10771,8 +10768,9 @@ dependencies = [
 [[package]]
 name = "sp-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
+ "lazy_static",
  "parity-scale-codec",
  "scale-info",
  "serde",
@@ -10783,12 +10781,13 @@ dependencies = [
  "sp-mmr-primitives",
  "sp-runtime",
  "sp-std",
+ "strum",
 ]
 
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -10800,7 +10799,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "futures",
  "log",
@@ -10818,7 +10817,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "async-trait",
  "futures",
@@ -10836,7 +10835,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -10854,7 +10853,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "async-trait",
  "merlin",
@@ -10877,7 +10876,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10889,7 +10888,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10902,12 +10901,13 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "array-bytes 4.2.0",
  "base58",
  "bitflags 1.3.2",
  "blake2",
+ "bounded-collections",
  "dyn-clonable",
  "ed25519-zebra",
  "futures",
@@ -10944,7 +10944,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "blake2",
  "byteorder",
@@ -10958,7 +10958,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10969,7 +10969,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.1",
@@ -10978,7 +10978,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10988,7 +10988,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -10999,7 +10999,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -11017,11 +11017,12 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
  "parity-scale-codec",
+ "scale-info",
  "sp-core",
  "sp-runtime",
  "sp-std",
@@ -11031,7 +11032,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "bytes",
  "ed25519",
@@ -11056,7 +11057,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -11067,7 +11068,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "async-trait",
  "futures",
@@ -11084,7 +11085,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "thiserror",
  "zstd",
@@ -11093,7 +11094,7 @@ dependencies = [
 [[package]]
 name = "sp-mmr-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "ckb-merkle-mountain-range",
  "log",
@@ -11111,7 +11112,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11125,7 +11126,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -11135,7 +11136,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -11145,7 +11146,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -11155,7 +11156,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -11177,7 +11178,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -11195,7 +11196,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -11207,7 +11208,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11221,7 +11222,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11233,7 +11234,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "hash-db",
  "log",
@@ -11253,12 +11254,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 
 [[package]]
 name = "sp-storage"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -11271,7 +11272,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "async-trait",
  "futures-timer",
@@ -11286,7 +11287,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -11298,7 +11299,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -11307,7 +11308,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "async-trait",
  "log",
@@ -11323,7 +11324,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "ahash 0.8.3",
  "hash-db",
@@ -11346,7 +11347,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -11363,7 +11364,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -11374,8 +11375,9 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
+ "anyhow",
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
@@ -11387,7 +11389,7 @@ dependencies = [
 [[package]]
 name = "sp-weights"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11447,7 +11449,6 @@ dependencies = [
  "pallet-multisig",
  "pallet-preimage",
  "pallet-proxy",
- "pallet-randomness-collective-flip",
  "pallet-scheduler",
  "pallet-session",
  "pallet-timestamp",
@@ -11574,19 +11575,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "statrs"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05bdbb8e4e78216a85785a85d3ec3183144f98d0097b9281802c019bb07a6f05"
-dependencies = [
- "approx",
- "lazy_static",
- "nalgebra",
- "num-traits",
- "rand 0.8.5",
-]
-
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -11650,7 +11638,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "platforms 2.0.0",
 ]
@@ -11658,7 +11646,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures",
@@ -11677,7 +11665,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "hyper",
  "log",
@@ -11689,7 +11677,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc-client"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "async-trait",
  "jsonrpsee",
@@ -11702,7 +11690,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-trie-migration-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "jsonrpsee",
  "log",
@@ -11721,7 +11709,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
  "ansi_term",
  "build-helper",
@@ -11826,7 +11814,7 @@ dependencies = [
  "cfg-if",
  "fastrand",
  "redox_syscall",
- "rustix 0.36.10",
+ "rustix",
  "windows-sys 0.42.0",
 ]
 
@@ -12199,8 +12187,8 @@ dependencies = [
 
 [[package]]
 name = "tracing-gum"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-primitives",
@@ -12210,8 +12198,8 @@ dependencies = [
 
 [[package]]
 name = "tracing-gum-proc-macro"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "expander 0.0.6",
  "proc-macro-crate",
@@ -12266,12 +12254,12 @@ dependencies = [
 
 [[package]]
 name = "trie-db"
-version = "0.24.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "004e1e8f92535694b4cb1444dc5a8073ecf0815e3357f729638b9f8fc4062908"
+checksum = "3390c0409daaa6027d6681393316f4ccd3ff82e1590a1e4725014e3ae2bf1920"
 dependencies = [
  "hash-db",
- "hashbrown 0.12.3",
+ "hashbrown 0.13.2",
  "log",
  "rustc-hex",
  "smallvec",
@@ -12341,8 +12329,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
 dependencies = [
+ "async-trait",
  "clap",
  "frame-remote-externalities",
  "frame-try-runtime",
@@ -12355,14 +12344,19 @@ dependencies = [
  "serde",
  "serde_json",
  "sp-api",
+ "sp-consensus-aura",
+ "sp-consensus-babe",
  "sp-core",
  "sp-debug-derive",
  "sp-externalities",
+ "sp-inherents",
  "sp-io",
  "sp-keystore",
  "sp-rpc",
  "sp-runtime",
  "sp-state-machine",
+ "sp-timestamp",
+ "sp-transaction-storage-proof",
  "sp-version",
  "sp-weights",
  "substrate-rpc-client",
@@ -12760,22 +12754,24 @@ dependencies = [
  "memory_units",
  "num-rational",
  "num-traits",
+ "region",
 ]
 
 [[package]]
 name = "wasmparser"
-version = "0.89.1"
+version = "0.100.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5d3e08b13876f96dd55608d03cd4883a0545884932d5adf11925876c96daef"
+checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4"
 dependencies = [
  "indexmap",
+ "url",
 ]
 
 [[package]]
 name = "wasmtime"
-version = "1.0.2"
+version = "6.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad5af6ba38311282f2a21670d96e78266e8c8e2f38cbcd52c254df6ccbc7731"
+checksum = "f6e89f9819523447330ffd70367ef4a18d8c832e24e8150fe054d1d912841632"
 dependencies = [
  "anyhow",
  "bincode",
@@ -12796,23 +12792,23 @@ dependencies = [
  "wasmtime-environ",
  "wasmtime-jit",
  "wasmtime-runtime",
- "windows-sys 0.36.1",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
 name = "wasmtime-asm-macros"
-version = "1.0.2"
+version = "6.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45de63ddfc8b9223d1adc8f7b2ee5f35d1f6d112833934ad7ea66e4f4339e597"
+checksum = "9bd3a5e46c198032da934469f3a6e48649d1f9142438e4fd4617b68a35644b8a"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "wasmtime-cache"
-version = "1.0.2"
+version = "6.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcd849399d17d2270141cfe47fa0d91ee52d5f8ea9b98cf7ddde0d53e5f79882"
+checksum = "b389ae9b678b9c3851091a4804f4182d688d27aff7abc9aa37fa7be37d8ecffa"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
@@ -12820,19 +12816,19 @@ dependencies = [
  "directories-next",
  "file-per-thread-logger",
  "log",
- "rustix 0.35.13",
+ "rustix",
  "serde",
- "sha2 0.9.9",
+ "sha2 0.10.6",
  "toml",
- "windows-sys 0.36.1",
+ "windows-sys 0.42.0",
  "zstd",
 ]
 
 [[package]]
 name = "wasmtime-cranelift"
-version = "1.0.2"
+version = "6.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bd91339b742ff20bfed4532a27b73c86b5bcbfedd6bea2dcdf2d64471e1b5c6"
+checksum = "59b2c92a08c0db6efffd88fdc97d7aa9c7c63b03edb0971dbca745469f820e8c"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -12851,9 +12847,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-environ"
-version = "1.0.2"
+version = "6.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebb881c61f4f627b5d45c54e629724974f8a8890d455bcbe634330cc27309644"
+checksum = "9a6db9fc52985ba06ca601f2ff0ff1f526c5d724c7ac267b47326304b0c97883"
 dependencies = [
  "anyhow",
  "cranelift-entity",
@@ -12870,9 +12866,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-jit"
-version = "1.0.2"
+version = "6.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1985c628011fe26adf5e23a5301bdc79b245e0e338f14bb58b39e4e25e4d8681"
+checksum = "b77e3a52cd84d0f7f18554afa8060cfe564ccac61e3b0802d3fd4084772fa5f6"
 dependencies = [
  "addr2line 0.17.0",
  "anyhow",
@@ -12883,32 +12879,42 @@ dependencies = [
  "log",
  "object 0.29.0",
  "rustc-demangle",
- "rustix 0.35.13",
  "serde",
  "target-lexicon",
- "thiserror",
  "wasmtime-environ",
  "wasmtime-jit-debug",
+ "wasmtime-jit-icache-coherence",
  "wasmtime-runtime",
- "windows-sys 0.36.1",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
 name = "wasmtime-jit-debug"
-version = "1.0.2"
+version = "6.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f671b588486f5ccec8c5a3dba6b4c07eac2e66ab8c60e6f4e53717c77f709731"
+checksum = "d0245e8a9347017c7185a72e215218a802ff561545c242953c11ba00fccc930f"
 dependencies = [
  "object 0.29.0",
  "once_cell",
- "rustix 0.35.13",
+ "rustix",
+]
+
+[[package]]
+name = "wasmtime-jit-icache-coherence"
+version = "6.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67d412e9340ab1c83867051d8d1d7c90aa8c9afc91da086088068e2734e25064"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
 name = "wasmtime-runtime"
-version = "1.0.2"
+version = "6.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee8f92ad4b61736339c29361da85769ebc200f184361959d1792832e592a1afd"
+checksum = "d594e791b5fdd4dbaf8cf7ae62f2e4ff85018ce90f483ca6f42947688e48827d"
 dependencies = [
  "anyhow",
  "cc",
@@ -12921,19 +12927,18 @@ dependencies = [
  "memoffset 0.6.5",
  "paste",
  "rand 0.8.5",
- "rustix 0.35.13",
- "thiserror",
+ "rustix",
  "wasmtime-asm-macros",
  "wasmtime-environ",
  "wasmtime-jit-debug",
- "windows-sys 0.36.1",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
 name = "wasmtime-types"
-version = "1.0.2"
+version = "6.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d23d61cb4c46e837b431196dd06abb11731541021916d03476a178b54dc07aeb"
+checksum = "a6688d6f96d4dbc1f89fab626c56c1778936d122b5f4ae7a57c2eb42b8d982e2"
 dependencies = [
  "cranelift-entity",
  "serde",
@@ -13194,8 +13199,8 @@ dependencies = [
 
 [[package]]
 name = "westend-runtime"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -13239,6 +13244,7 @@ dependencies = [
  "pallet-society",
  "pallet-staking",
  "pallet-staking-reward-curve",
+ "pallet-staking-runtime-api",
  "pallet-state-trie-migration",
  "pallet-sudo",
  "pallet-timestamp",
@@ -13285,8 +13291,8 @@ dependencies = [
 
 [[package]]
 name = "westend-runtime-constants"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -13308,6 +13314,16 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "wide"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b689b6c49d6549434bf944e6b0f39238cf63693cb7a147e9d887507fffa3b223"
+dependencies = [
+ "bytemuck",
+ "safe_arch",
+]
+
 [[package]]
 name = "widestring"
 version = "0.5.1"
@@ -13358,19 +13374,6 @@ dependencies = [
  "windows_x86_64_msvc 0.34.0",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.42.0"
@@ -13422,12 +13425,6 @@ version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -13440,12 +13437,6 @@ version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -13458,12 +13449,6 @@ version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -13476,12 +13461,6 @@ version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -13500,12 +13479,6 @@ version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -13600,24 +13573,24 @@ dependencies = [
 
 [[package]]
 name = "xcm"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
+ "bounded-collections",
  "derivative",
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-core",
  "sp-weights",
  "xcm-procedural",
 ]
 
 [[package]]
 name = "xcm-builder"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -13637,8 +13610,8 @@ dependencies = [
 
 [[package]]
 name = "xcm-executor"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "environmental",
  "frame-benchmarking",
@@ -13657,8 +13630,8 @@ dependencies = [
 
 [[package]]
 name = "xcm-procedural"
-version = "0.9.38"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7"
+version = "0.9.39-1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e1c4173bf6966f5d1980f4299f7abe836f0c1"
 dependencies = [
  "Inflector",
  "proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index cec69ac20e..a08152f9c2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,13 +24,13 @@ panic = "unwind"
 
 [workspace.dependencies]
 # Build deps
-substrate-wasm-builder = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
+substrate-wasm-builder = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
 
 # External (without extra features and with default disabled if necessary)
 base58 = {version = "0.2.0", default-features = false}
 bitflags = {version = "1.3.2", default-features = false}
-clap = "4.0.9"
-codec = {package = "parity-scale-codec", version = "3.1.5", default-features = false}
+clap = "4.1.6"
+parity-scale-codec = {version = "3.1.5", default-features = false}
 env_logger = "0.10.0"
 futures = {version = "0.3.21", default-features = false}
 hex = {version = "0.4.0", default-features = false}
@@ -71,112 +71,111 @@ peregrine-runtime = {path = "runtimes/peregrine", default-features = false}
 spiritnet-runtime = {path = "runtimes/spiritnet", default-features = false}
 
 # Benchmarking (with default disabled)
-cumulus-pallet-session-benchmarking = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.38"}
-frame-system-benchmarking = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
+cumulus-pallet-session-benchmarking = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.39"}
+frame-system-benchmarking = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
 
 # Cumulus (with default disabled)
-cumulus-pallet-aura-ext = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.38"}
-cumulus-pallet-dmp-queue = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.38"}
-cumulus-pallet-parachain-system = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.38"}
-cumulus-pallet-xcm = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.38"}
-cumulus-pallet-xcmp-queue = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.38"}
-cumulus-primitives-core = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.38"}
-cumulus-primitives-timestamp = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.38"}
-cumulus-primitives-utility = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-collator-selection = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.38"}
-parachain-info = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.38"}
+cumulus-pallet-aura-ext = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.39"}
+cumulus-pallet-dmp-queue = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.39"}
+cumulus-pallet-parachain-system = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.39"}
+cumulus-pallet-xcm = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.39"}
+cumulus-pallet-xcmp-queue = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.39"}
+cumulus-primitives-core = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.39"}
+cumulus-primitives-timestamp = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.39"}
+cumulus-primitives-utility = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-collator-selection = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.39"}
+parachain-info = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.39"}
 
 # Substrate (with default disabled)
-frame-benchmarking = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-frame-benchmarking-cli = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-frame-executive = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-frame-support = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-frame-system = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-frame-system-rpc-runtime-api = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-frame-try-runtime = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-aura = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-authorship = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-balances = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-collective = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-democracy = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-grandpa = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-indices = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-membership = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-preimage = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-proxy = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-randomness-collective-flip = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-scheduler = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-session = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-sudo = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-timestamp = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-tips = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-transaction-payment = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-transaction-payment-rpc-runtime-api = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-treasury = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-utility = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-vesting = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-pallet-multisig = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-sp-api = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-sp-block-builder = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-sp-consensus-aura = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-sp-core = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-sp-inherents = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-sp-io = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-sp-offchain = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-sp-runtime = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-sp-session = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-sp-staking = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-sp-std = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-sp-transaction-pool = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-sp-version = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-sp-weights = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
-try-runtime-cli = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38"}
+frame-benchmarking = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+frame-benchmarking-cli = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+frame-executive = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+frame-support = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+frame-system = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+frame-system-rpc-runtime-api = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+frame-try-runtime = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-aura = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-authorship = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-balances = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-collective = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-democracy = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-grandpa = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-indices = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-membership = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-preimage = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-proxy = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-scheduler = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-session = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-sudo = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-timestamp = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-tips = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-transaction-payment = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-transaction-payment-rpc-runtime-api = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-treasury = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-utility = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-vesting = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+pallet-multisig = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+sp-api = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+sp-block-builder = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+sp-consensus-aura = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+sp-core = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+sp-inherents = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+sp-io = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+sp-offchain = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+sp-runtime = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+sp-session = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+sp-staking = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+sp-std = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+sp-transaction-pool = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+sp-version = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+sp-weights = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
+try-runtime-cli = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.39"}
 
 # Polkadot (with default disabled)
-pallet-xcm = {git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.38"}
-polkadot-parachain = {git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.38"}
-xcm = {git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.38"}
-xcm-builder = {git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.38"}
-xcm-executor = {git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.38"}
+pallet-xcm = {git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.39"}
+polkadot-parachain = {git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.39"}
+xcm = {git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.39"}
+xcm-builder = {git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.39"}
+xcm-executor = {git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.39"}
 
 # Client-only (with default enabled)
-cumulus-client-cli = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38"}
-cumulus-client-consensus-aura = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38"}
-cumulus-client-consensus-common = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38"}
-cumulus-client-network = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38"}
-cumulus-client-service = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38"}
-cumulus-primitives-parachain-inherent = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38"}
-cumulus-relay-chain-inprocess-interface = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38"}
-cumulus-relay-chain-interface = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38"}
-cumulus-relay-chain-minimal-node = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38"}
-cumulus-relay-chain-rpc-interface = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38"}
-pallet-transaction-payment-rpc = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-polkadot-cli = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38"}
-polkadot-primitives = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38"}
-polkadot-service = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38"}
-sc-basic-authorship = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sc-chain-spec = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sc-cli = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sc-client-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sc-consensus = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sc-consensus-aura = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sc-executor = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sc-finality-grandpa = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sc-keystore = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sc-network = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sc-rpc-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sc-service = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sc-sysinfo = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sc-telemetry = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sc-tracing = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sc-transaction-pool = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sc-transaction-pool-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sp-blockchain = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sp-consensus = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sp-finality-grandpa = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sp-keyring = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sp-keystore = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-sp-timestamp = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-substrate-build-script-utils = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-substrate-frame-rpc-system = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
-substrate-prometheus-endpoint = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38"}
+cumulus-client-cli = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.39"}
+cumulus-client-consensus-aura = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.39"}
+cumulus-client-consensus-common = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.39"}
+cumulus-client-network = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.39"}
+cumulus-client-service = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.39"}
+cumulus-primitives-parachain-inherent = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.39"}
+cumulus-relay-chain-inprocess-interface = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.39"}
+cumulus-relay-chain-interface = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.39"}
+cumulus-relay-chain-minimal-node = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.39"}
+cumulus-relay-chain-rpc-interface = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.39"}
+pallet-transaction-payment-rpc = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+polkadot-cli = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.39"}
+polkadot-primitives = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.39"}
+polkadot-service = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.39"}
+sc-basic-authorship = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sc-chain-spec = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sc-cli = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sc-client-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sc-consensus = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sc-consensus-aura = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sc-executor = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sc-finality-grandpa = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sc-keystore = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sc-network = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sc-rpc-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sc-service = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sc-sysinfo = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sc-telemetry = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sc-tracing = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sc-transaction-pool = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sc-transaction-pool-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sp-blockchain = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sp-consensus = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sp-finality-grandpa = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sp-keyring = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sp-keystore = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+sp-timestamp = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+substrate-build-script-utils = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+substrate-frame-rpc-system = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
+substrate-prometheus-endpoint = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39"}
diff --git a/crates/assets/Cargo.toml b/crates/assets/Cargo.toml
index a233d94eea..c3bd616dc7 100644
--- a/crates/assets/Cargo.toml
+++ b/crates/assets/Cargo.toml
@@ -18,7 +18,7 @@ hex-literal.workspace = true
 log.workspace = true
 
 # Parity dependencies
-codec = {package = "parity-scale-codec", workspace = true, features = ["derive"]}
+parity-scale-codec = {workspace = true, features = ["derive"]}
 scale-info = {workspace = true, features = ["derive"]}
 
 # Substrate dependencies
@@ -29,7 +29,7 @@ sp-std.workspace = true
 [features]
 default = ["std"]
 std = [
-  "codec/std",
+  "parity-scale-codec/std",
   "hex/std",
   "log/std",
   "scale-info/std",
diff --git a/crates/assets/src/asset.rs b/crates/assets/src/asset.rs
index ed1cfa210d..8dc10279cd 100644
--- a/crates/assets/src/asset.rs
+++ b/crates/assets/src/asset.rs
@@ -23,7 +23,7 @@ pub use v1::*;
 pub mod v1 {
 	use crate::errors::asset::{Error, IdentifierError, NamespaceError, ReferenceError};
 
-	use codec::{Decode, Encode, MaxEncodedLen};
+	use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 	use scale_info::TypeInfo;
 
 	use core::{format_args, str};
@@ -34,32 +34,32 @@ pub mod v1 {
 
 	/// The minimum length, including separator symbols, an asset ID can have
 	/// according to the minimum values defined by the CAIP-19 definition.
-	pub const MINIMUM_ASSET_ID_LENGTH: usize = MINIMUM_NAMESPACE_LENGTH + 1 + MINIMUM_REFERENCE_LENGTH;
+	pub const MINIMUM_ASSET_ID_LENGTH: usize = MINIMUM_ASSET_NAMESPACE_LENGTH + 1 + MINIMUM_ASSET_REFERENCE_LENGTH;
 	/// The maximum length, including separator symbols, an asset ID can have
 	/// according to the minimum values defined by the CAIP-19 definition.
 	pub const MAXIMUM_ASSET_ID_LENGTH: usize =
-		MAXIMUM_NAMESPACE_LENGTH + 1 + MAXIMUM_REFERENCE_LENGTH + 1 + MAXIMUM_IDENTIFIER_LENGTH;
+		MAXIMUM_NAMESPACE_LENGTH + 1 + MAXIMUM_ASSET_REFERENCE_LENGTH + 1 + MAXIMUM_ASSET_IDENTIFIER_LENGTH;
 
 	/// The minimum length of a valid asset ID namespace.
-	pub const MINIMUM_NAMESPACE_LENGTH: usize = 3;
+	pub const MINIMUM_ASSET_NAMESPACE_LENGTH: usize = 3;
 	/// The maximum length of a valid asset ID namespace.
 	pub const MAXIMUM_NAMESPACE_LENGTH: usize = 8;
-	const MAXIMUM_NAMESPACE_LENGTH_U32: u32 = MAXIMUM_NAMESPACE_LENGTH as u32;
+	const MAXIMUM_ASSET_NAMESPACE_LENGTH_U32: u32 = MAXIMUM_NAMESPACE_LENGTH as u32;
 	/// The minimum length of a valid asset ID reference.
-	pub const MINIMUM_REFERENCE_LENGTH: usize = 1;
+	pub const MINIMUM_ASSET_REFERENCE_LENGTH: usize = 1;
 	/// The maximum length of a valid asset ID reference.
-	pub const MAXIMUM_REFERENCE_LENGTH: usize = 128;
-	const MAXIMUM_REFERENCE_LENGTH_U32: u32 = MAXIMUM_REFERENCE_LENGTH as u32;
+	pub const MAXIMUM_ASSET_REFERENCE_LENGTH: usize = 128;
+	const MAXIMUM_ASSET_REFERENCE_LENGTH_U32: u32 = MAXIMUM_ASSET_REFERENCE_LENGTH as u32;
 	/// The minimum length of a valid asset ID identifier.
-	pub const MINIMUM_IDENTIFIER_LENGTH: usize = 1;
+	pub const MINIMUM_ASSET_IDENTIFIER_LENGTH: usize = 1;
 	/// The maximum length of a valid asset ID reference.
-	pub const MAXIMUM_IDENTIFIER_LENGTH: usize = 78;
-	const MAXIMUM_IDENTIFIER_LENGTH_U32: u32 = MAXIMUM_IDENTIFIER_LENGTH as u32;
+	pub const MAXIMUM_ASSET_IDENTIFIER_LENGTH: usize = 78;
+	const MAXIMUM_ASSET_IDENTIFIER_LENGTH_U32: u32 = MAXIMUM_ASSET_IDENTIFIER_LENGTH as u32;
 
 	/// Separator between asset namespace and asset reference.
-	const NAMESPACE_REFERENCE_SEPARATOR: u8 = b':';
+	const ASSET_NAMESPACE_REFERENCE_SEPARATOR: u8 = b':';
 	/// Separator between asset reference and asset identifier.
-	const REFERENCE_IDENTIFIER_SEPARATOR: u8 = b':';
+	const ASSET_REFERENCE_IDENTIFIER_SEPARATOR: u8 = b':';
 
 	/// Namespace for Slip44 assets.
 	pub const SLIP44_NAMESPACE: &[u8] = b"slip44";
@@ -177,7 +177,7 @@ pub mod v1 {
 						str::from_utf8(SLIP44_NAMESPACE)
 							.expect("Conversion of Slip44 namespace to string should never fail.")
 					)?;
-					write!(f, "{}", char::from(NAMESPACE_REFERENCE_SEPARATOR))?;
+					write!(f, "{}", char::from(ASSET_NAMESPACE_REFERENCE_SEPARATOR))?;
 					reference.fmt(f)?;
 				}
 				Self::Erc20(reference) => {
@@ -187,7 +187,7 @@ pub mod v1 {
 						str::from_utf8(ERC20_NAMESPACE)
 							.expect("Conversion of Erc20 namespace to string should never fail.")
 					)?;
-					write!(f, "{}", char::from(NAMESPACE_REFERENCE_SEPARATOR))?;
+					write!(f, "{}", char::from(ASSET_NAMESPACE_REFERENCE_SEPARATOR))?;
 					reference.fmt(f)?;
 				}
 				Self::Erc721(EvmSmartContractNonFungibleReference(reference, identifier)) => {
@@ -197,10 +197,10 @@ pub mod v1 {
 						str::from_utf8(ERC721_NAMESPACE)
 							.expect("Conversion of Erc721 namespace to string should never fail.")
 					)?;
-					write!(f, "{}", char::from(NAMESPACE_REFERENCE_SEPARATOR))?;
+					write!(f, "{}", char::from(ASSET_NAMESPACE_REFERENCE_SEPARATOR))?;
 					reference.fmt(f)?;
 					if let Some(id) = identifier {
-						write!(f, "{}", char::from(REFERENCE_IDENTIFIER_SEPARATOR))?;
+						write!(f, "{}", char::from(ASSET_REFERENCE_IDENTIFIER_SEPARATOR))?;
 						id.fmt(f)?;
 					}
 				}
@@ -211,10 +211,10 @@ pub mod v1 {
 						str::from_utf8(ERC1155_NAMESPACE)
 							.expect("Conversion of Erc1155 namespace to string should never fail.")
 					)?;
-					write!(f, "{}", char::from(NAMESPACE_REFERENCE_SEPARATOR))?;
+					write!(f, "{}", char::from(ASSET_NAMESPACE_REFERENCE_SEPARATOR))?;
 					reference.fmt(f)?;
 					if let Some(id) = identifier {
-						write!(f, "{}", char::from(REFERENCE_IDENTIFIER_SEPARATOR))?;
+						write!(f, "{}", char::from(ASSET_REFERENCE_IDENTIFIER_SEPARATOR))?;
 						id.fmt(f)?;
 					}
 				}
@@ -224,10 +224,10 @@ pub mod v1 {
 					id,
 				}) => {
 					namespace.fmt(f)?;
-					write!(f, "{}", char::from(NAMESPACE_REFERENCE_SEPARATOR))?;
+					write!(f, "{}", char::from(ASSET_NAMESPACE_REFERENCE_SEPARATOR))?;
 					reference.fmt(f)?;
 					if let Some(identifier) = id {
-						write!(f, "{}", char::from(REFERENCE_IDENTIFIER_SEPARATOR))?;
+						write!(f, "{}", char::from(ASSET_REFERENCE_IDENTIFIER_SEPARATOR))?;
 						identifier.fmt(f)?;
 					}
 				}
@@ -238,7 +238,7 @@ pub mod v1 {
 
 	const fn check_namespace_length_bounds(namespace: &[u8]) -> Result<(), NamespaceError> {
 		let namespace_length = namespace.len();
-		if namespace_length < MINIMUM_NAMESPACE_LENGTH {
+		if namespace_length < MINIMUM_ASSET_NAMESPACE_LENGTH {
 			Err(NamespaceError::TooShort)
 		} else if namespace_length > MAXIMUM_NAMESPACE_LENGTH {
 			Err(NamespaceError::TooLong)
@@ -249,9 +249,9 @@ pub mod v1 {
 
 	const fn check_reference_length_bounds(reference: &[u8]) -> Result<(), ReferenceError> {
 		let reference_length = reference.len();
-		if reference_length < MINIMUM_REFERENCE_LENGTH {
+		if reference_length < MINIMUM_ASSET_REFERENCE_LENGTH {
 			Err(ReferenceError::TooShort)
-		} else if reference_length > MAXIMUM_REFERENCE_LENGTH {
+		} else if reference_length > MAXIMUM_ASSET_REFERENCE_LENGTH {
 			Err(ReferenceError::TooLong)
 		} else {
 			Ok(())
@@ -260,9 +260,9 @@ pub mod v1 {
 
 	const fn check_identifier_length_bounds(identifier: &[u8]) -> Result<(), IdentifierError> {
 		let identifier_length = identifier.len();
-		if identifier_length < MINIMUM_IDENTIFIER_LENGTH {
+		if identifier_length < MINIMUM_ASSET_IDENTIFIER_LENGTH {
 			Err(IdentifierError::TooShort)
-		} else if identifier_length > MAXIMUM_IDENTIFIER_LENGTH {
+		} else if identifier_length > MAXIMUM_ASSET_IDENTIFIER_LENGTH {
 			Err(IdentifierError::TooLong)
 		} else {
 			Ok(())
@@ -272,12 +272,12 @@ pub mod v1 {
 	/// Split the given input into its components, i.e., namespace, reference,
 	/// and identifier, if the proper separators are found.
 	fn split_components(input: &[u8]) -> AssetComponents {
-		let mut split = input.splitn(2, |c| *c == NAMESPACE_REFERENCE_SEPARATOR);
+		let mut split = input.splitn(2, |c| *c == ASSET_NAMESPACE_REFERENCE_SEPARATOR);
 		let (namespace, reference) = (split.next(), split.next());
 
 		// Split the remaining reference to extract the identifier, if present
 		let (reference, identifier) = if let Some(r) = reference {
-			let mut split = r.splitn(2, |c| *c == REFERENCE_IDENTIFIER_SEPARATOR);
+			let mut split = r.splitn(2, |c| *c == ASSET_REFERENCE_IDENTIFIER_SEPARATOR);
 			// Split the reference further, if present
 			(split.next(), split.next())
 		} else {
@@ -442,7 +442,7 @@ pub mod v1 {
 	/// identifier without applying any special parsing/decoding logic.
 	#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, RuntimeDebug, Encode, Decode, MaxEncodedLen, TypeInfo)]
 	pub struct EvmSmartContractNonFungibleIdentifier(
-		pub(crate) BoundedVec<u8, ConstU32<MAXIMUM_IDENTIFIER_LENGTH_U32>>,
+		pub(crate) BoundedVec<u8, ConstU32<MAXIMUM_ASSET_IDENTIFIER_LENGTH_U32>>,
 	);
 
 	impl EvmSmartContractNonFungibleIdentifier {
@@ -456,7 +456,7 @@ pub mod v1 {
 			check_identifier_length_bounds(input)?;
 
 			input.iter().try_for_each(|c| {
-				if !(b'0'..=b'9').contains(c) {
+				if !c.is_ascii_digit() {
 					log::trace!("Provided input has some invalid values as expected by a smart contract-based asset identifier.");
 					Err(IdentifierError::InvalidFormat)
 				} else {
@@ -542,7 +542,7 @@ pub mod v1 {
 	/// It stores the provided UTF8-encoded namespace without trying to apply
 	/// any parsing/decoding logic.
 	#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, RuntimeDebug, Encode, Decode, MaxEncodedLen, TypeInfo)]
-	pub struct GenericAssetNamespace(pub(crate) BoundedVec<u8, ConstU32<MAXIMUM_NAMESPACE_LENGTH_U32>>);
+	pub struct GenericAssetNamespace(pub(crate) BoundedVec<u8, ConstU32<MAXIMUM_ASSET_NAMESPACE_LENGTH_U32>>);
 
 	impl GenericAssetNamespace {
 		/// Parse a generic UTF8-encoded asset namespace, failing if the input
@@ -591,7 +591,7 @@ pub mod v1 {
 
 	/// A generic asset reference as defined in the [CAIP-19 spec](https://github.com/ChainAgnostic/CAIPs/blob/master/CAIPs/caip-19.md).
 	#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, RuntimeDebug, Encode, Decode, MaxEncodedLen, TypeInfo)]
-	pub struct GenericAssetReference(pub(crate) BoundedVec<u8, ConstU32<MAXIMUM_REFERENCE_LENGTH_U32>>);
+	pub struct GenericAssetReference(pub(crate) BoundedVec<u8, ConstU32<MAXIMUM_ASSET_REFERENCE_LENGTH_U32>>);
 
 	impl GenericAssetReference {
 		/// Parse a generic UTF8-encoded asset reference, failing if the input
@@ -640,7 +640,7 @@ pub mod v1 {
 
 	/// A generic asset identifier as defined in the [CAIP-19 spec](https://github.com/ChainAgnostic/CAIPs/blob/master/CAIPs/caip-19.md).
 	#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, RuntimeDebug, Encode, Decode, MaxEncodedLen, TypeInfo)]
-	pub struct GenericAssetIdentifier(pub(crate) BoundedVec<u8, ConstU32<MAXIMUM_IDENTIFIER_LENGTH_U32>>);
+	pub struct GenericAssetIdentifier(pub(crate) BoundedVec<u8, ConstU32<MAXIMUM_ASSET_IDENTIFIER_LENGTH_U32>>);
 
 	impl GenericAssetIdentifier {
 		/// Parse a generic UTF8-encoded asset identifier, failing if the input
diff --git a/crates/assets/src/chain.rs b/crates/assets/src/chain.rs
index eb64a9933c..aacff16e72 100644
--- a/crates/assets/src/chain.rs
+++ b/crates/assets/src/chain.rs
@@ -28,7 +28,7 @@ mod v1 {
 
 	use core::str;
 
-	use codec::{Decode, Encode, MaxEncodedLen};
+	use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 	use scale_info::TypeInfo;
 
 	use frame_support::{sp_runtime::RuntimeDebug, traits::ConstU32, BoundedVec};
@@ -36,24 +36,24 @@ mod v1 {
 
 	/// The minimum length, including separator symbols, a chain ID can have
 	/// according to the minimum values defined by the CAIP-2 definition.
-	pub const MINIMUM_CHAIN_ID_LENGTH: usize = MINIMUM_NAMESPACE_LENGTH + 1 + MINIMUM_REFERENCE_LENGTH;
+	pub const MINIMUM_CHAIN_ID_LENGTH: usize = MINIMUM_CHAIN_NAMESPACE_LENGTH + 1 + MINIMUM_CHAIN_REFERENCE_LENGTH;
 	/// The maximum length, including separator symbols, a chain ID can have
 	/// according to the minimum values defined by the CAIP-2 definition.
-	pub const MAXIMUM_CHAIN_ID_LENGTH: usize = MAXIMUM_NAMESPACE_LENGTH + 1 + MAXIMUM_REFERENCE_LENGTH;
+	pub const MAXIMUM_CHAIN_ID_LENGTH: usize = MAXIMUM_CHAIN_NAMESPACE_LENGTH + 1 + MAXIMUM_CHAIN_REFERENCE_LENGTH;
 
 	/// The minimum length of a valid chain ID namespace.
-	pub const MINIMUM_NAMESPACE_LENGTH: usize = 3;
+	pub const MINIMUM_CHAIN_NAMESPACE_LENGTH: usize = 3;
 	/// The maximum length of a valid chain ID namespace.
-	pub const MAXIMUM_NAMESPACE_LENGTH: usize = 8;
-	const MAXIMUM_NAMESPACE_LENGTH_U32: u32 = MAXIMUM_NAMESPACE_LENGTH as u32;
+	pub const MAXIMUM_CHAIN_NAMESPACE_LENGTH: usize = 8;
+	const MAXIMUM_CHAIN_NAMESPACE_LENGTH_U32: u32 = MAXIMUM_CHAIN_NAMESPACE_LENGTH as u32;
 	/// The minimum length of a valid chain ID reference.
-	pub const MINIMUM_REFERENCE_LENGTH: usize = 1;
+	pub const MINIMUM_CHAIN_REFERENCE_LENGTH: usize = 1;
 	/// The maximum length of a valid chain ID reference.
-	pub const MAXIMUM_REFERENCE_LENGTH: usize = 32;
-	const MAXIMUM_REFERENCE_LENGTH_U32: u32 = MAXIMUM_REFERENCE_LENGTH as u32;
+	pub const MAXIMUM_CHAIN_REFERENCE_LENGTH: usize = 32;
+	const MAXIMUM_CHAIN_REFERENCE_LENGTH_U32: u32 = MAXIMUM_CHAIN_REFERENCE_LENGTH as u32;
 
 	/// Separator between chain namespace and chain reference.
-	const NAMESPACE_REFERENCE_SEPARATOR: u8 = b':';
+	const CHAIN_NAMESPACE_REFERENCE_SEPARATOR: u8 = b':';
 	/// Namespace for Eip155 chains.
 	pub const EIP155_NAMESPACE: &[u8] = b"eip155";
 	/// Namespace for Bip122 chains.
@@ -201,7 +201,7 @@ mod v1 {
 						str::from_utf8(BIP122_NAMESPACE)
 							.expect("Conversion of Bip122 namespace to string should never fail.")
 					)?;
-					write!(f, "{}", char::from(NAMESPACE_REFERENCE_SEPARATOR))?;
+					write!(f, "{}", char::from(CHAIN_NAMESPACE_REFERENCE_SEPARATOR))?;
 					reference.fmt(f)?;
 				}
 				Self::Eip155(reference) => {
@@ -211,7 +211,7 @@ mod v1 {
 						str::from_utf8(EIP155_NAMESPACE)
 							.expect("Conversion of Eip155 namespace to string should never fail.")
 					)?;
-					write!(f, "{}", char::from(NAMESPACE_REFERENCE_SEPARATOR))?;
+					write!(f, "{}", char::from(CHAIN_NAMESPACE_REFERENCE_SEPARATOR))?;
 					reference.fmt(f)?;
 				}
 				Self::Dotsama(reference) => {
@@ -221,7 +221,7 @@ mod v1 {
 						str::from_utf8(DOTSAMA_NAMESPACE)
 							.expect("Conversion of Dotsama namespace to string should never fail.")
 					)?;
-					write!(f, "{}", char::from(NAMESPACE_REFERENCE_SEPARATOR))?;
+					write!(f, "{}", char::from(CHAIN_NAMESPACE_REFERENCE_SEPARATOR))?;
 					reference.fmt(f)?;
 				}
 				Self::Solana(reference) => {
@@ -231,12 +231,12 @@ mod v1 {
 						str::from_utf8(SOLANA_NAMESPACE)
 							.expect("Conversion of Solana namespace to string should never fail.")
 					)?;
-					write!(f, "{}", char::from(NAMESPACE_REFERENCE_SEPARATOR))?;
+					write!(f, "{}", char::from(CHAIN_NAMESPACE_REFERENCE_SEPARATOR))?;
 					reference.fmt(f)?;
 				}
 				Self::Generic(GenericChainId { namespace, reference }) => {
 					namespace.fmt(f)?;
-					write!(f, "{}", char::from(NAMESPACE_REFERENCE_SEPARATOR))?;
+					write!(f, "{}", char::from(CHAIN_NAMESPACE_REFERENCE_SEPARATOR))?;
 					reference.fmt(f)?;
 				}
 			}
@@ -246,9 +246,9 @@ mod v1 {
 
 	const fn check_namespace_length_bounds(namespace: &[u8]) -> Result<(), NamespaceError> {
 		let namespace_length = namespace.len();
-		if namespace_length < MINIMUM_NAMESPACE_LENGTH {
+		if namespace_length < MINIMUM_CHAIN_NAMESPACE_LENGTH {
 			Err(NamespaceError::TooShort)
-		} else if namespace_length > MAXIMUM_NAMESPACE_LENGTH {
+		} else if namespace_length > MAXIMUM_CHAIN_NAMESPACE_LENGTH {
 			Err(NamespaceError::TooLong)
 		} else {
 			Ok(())
@@ -257,9 +257,9 @@ mod v1 {
 
 	const fn check_reference_length_bounds(reference: &[u8]) -> Result<(), ReferenceError> {
 		let reference_length = reference.len();
-		if reference_length < MINIMUM_REFERENCE_LENGTH {
+		if reference_length < MINIMUM_CHAIN_REFERENCE_LENGTH {
 			Err(ReferenceError::TooShort)
-		} else if reference_length > MAXIMUM_REFERENCE_LENGTH {
+		} else if reference_length > MAXIMUM_CHAIN_REFERENCE_LENGTH {
 			Err(ReferenceError::TooLong)
 		} else {
 			Ok(())
@@ -269,7 +269,7 @@ mod v1 {
 	/// Split the given input into its components, i.e., namespace, and
 	/// reference, if the proper separator is found.
 	fn split_components(input: &[u8]) -> ChainComponents {
-		let mut split = input.as_ref().splitn(2, |c| *c == NAMESPACE_REFERENCE_SEPARATOR);
+		let mut split = input.as_ref().splitn(2, |c| *c == CHAIN_NAMESPACE_REFERENCE_SEPARATOR);
 		ChainComponents {
 			namespace: split.next(),
 			reference: split.next(),
@@ -529,7 +529,7 @@ mod v1 {
 	/// It stores the provided UTF8-encoded namespace without trying to apply
 	/// any parsing/decoding logic.
 	#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, RuntimeDebug, Encode, Decode, MaxEncodedLen, TypeInfo)]
-	pub struct GenericChainNamespace(pub(crate) BoundedVec<u8, ConstU32<MAXIMUM_NAMESPACE_LENGTH_U32>>);
+	pub struct GenericChainNamespace(pub(crate) BoundedVec<u8, ConstU32<MAXIMUM_CHAIN_NAMESPACE_LENGTH_U32>>);
 
 	impl GenericChainNamespace {
 		/// Parse a generic UTF8-encoded chain namespace, failing if the input
@@ -578,7 +578,7 @@ mod v1 {
 
 	/// A generic chain reference as defined in the [CAIP-2 spec](https://github.com/ChainAgnostic/CAIPs/blob/master/CAIPs/caip-2.md).
 	#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, RuntimeDebug, Encode, Decode, MaxEncodedLen, TypeInfo)]
-	pub struct GenericChainReference(pub(crate) BoundedVec<u8, ConstU32<MAXIMUM_REFERENCE_LENGTH_U32>>);
+	pub struct GenericChainReference(pub(crate) BoundedVec<u8, ConstU32<MAXIMUM_CHAIN_REFERENCE_LENGTH_U32>>);
 
 	impl GenericChainReference {
 		/// Parse a generic UTF8-encoded chain reference, failing if the input
diff --git a/crates/assets/src/v1.rs b/crates/assets/src/v1.rs
index c2b73fc4ce..c1d0dc54c1 100644
--- a/crates/assets/src/v1.rs
+++ b/crates/assets/src/v1.rs
@@ -15,8 +15,8 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
-use codec::{Decode, Encode, MaxEncodedLen};
 use hex_literal::hex;
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 
 use frame_support::sp_runtime::RuntimeDebug;
diff --git a/nodes/parachain/Cargo.toml b/nodes/parachain/Cargo.toml
index 49dd9198ae..b64cb66bac 100644
--- a/nodes/parachain/Cargo.toml
+++ b/nodes/parachain/Cargo.toml
@@ -21,7 +21,7 @@ substrate-build-script-utils.workspace = true
 [dependencies]
 # External dependencies
 clap = {workspace = true, features = ["derive"]}
-codec.workspace = true
+parity-scale-codec = {workspace = true, features = ["derive"]}
 hex-literal.workspace = true
 jsonrpsee = {workspace = true, features = ["server"]}
 log.workspace = true
diff --git a/nodes/parachain/src/command.rs b/nodes/parachain/src/command.rs
index b1b83d564f..1d481641f2 100644
--- a/nodes/parachain/src/command.rs
+++ b/nodes/parachain/src/command.rs
@@ -21,11 +21,11 @@ use crate::{
 	cli::{Cli, RelayChainCli, Subcommand},
 	service::{new_partial, PeregrineRuntimeExecutor, SpiritnetRuntimeExecutor},
 };
-use codec::Encode;
 use cumulus_client_cli::generate_genesis_block;
 use cumulus_primitives_core::ParaId;
 use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE};
 use log::{info, warn};
+use parity_scale_codec::Encode;
 #[cfg(feature = "try-runtime")]
 use polkadot_service::TaskManager;
 use runtime_common::Block;
@@ -343,11 +343,15 @@ pub fn run() -> Result<()> {
 		}
 		#[cfg(feature = "try-runtime")]
 		Some(Subcommand::TryRuntime(cmd)) => {
+			use runtime_common::constants::MILLISECS_PER_BLOCK;
 			use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};
+			use try_runtime_cli::block_building_info::timestamp_with_aura_info;
+
 			let runner = cli.create_runner(cmd)?;
 			let registry = &runner.config().prometheus_config.as_ref().map(|cfg| &cfg.registry);
 			let task_manager = TaskManager::new(runner.config().tokio_handle.clone(), *registry)
 				.map_err(|e| format!("Error: {:?}", e))?;
+			let info_provider = timestamp_with_aura_info(MILLISECS_PER_BLOCK);
 
 			if runner.config().chain_spec.is_peregrine() {
 				runner.async_run(|_| {
@@ -355,7 +359,7 @@ pub fn run() -> Result<()> {
 						cmd.run::<Block, ExtendedHostFunctions<
 							sp_io::SubstrateHostFunctions,
 							<PeregrineRuntimeExecutor as NativeExecutionDispatch>::ExtendHostFunctions,
-						>>(),
+						>, _>(Some(info_provider)),
 						task_manager,
 					))
 				})
@@ -365,7 +369,7 @@ pub fn run() -> Result<()> {
 						cmd.run::<Block, ExtendedHostFunctions<
 							sp_io::SubstrateHostFunctions,
 							<SpiritnetRuntimeExecutor as NativeExecutionDispatch>::ExtendHostFunctions,
-						>>(),
+						>, _>(Some(info_provider)),
 						task_manager,
 					))
 				})
diff --git a/nodes/parachain/src/service.rs b/nodes/parachain/src/service.rs
index b13567f2f4..caa7cb0a29 100644
--- a/nodes/parachain/src/service.rs
+++ b/nodes/parachain/src/service.rs
@@ -22,13 +22,12 @@ use jsonrpsee::RpcModule;
 use cumulus_client_cli::CollatorOptions;
 use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion};
 use cumulus_client_consensus_common::{ParachainBlockImport as TParachainBlockImport, ParachainConsensus};
-use cumulus_client_network::BlockAnnounceValidator;
 use cumulus_client_service::{
 	prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams,
 };
 use cumulus_primitives_core::ParaId;
 use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain;
-use cumulus_relay_chain_interface::{RelayChainInterface, RelayChainResult};
+use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayChainResult};
 use cumulus_relay_chain_minimal_node::build_minimal_relay_chain_node;
 use polkadot_service::{CollatorPair, NativeExecutionDispatch};
 use sc_consensus::ImportQueue;
@@ -303,9 +302,10 @@ where
 		hwbench.clone(),
 	)
 	.await
-	.map_err(|e| sc_service::Error::Application(Box::new(e) as Box<_>))?;
-
-	let block_announce_validator = BlockAnnounceValidator::new(relay_chain_interface.clone(), id);
+	.map_err(|e| match e {
+		RelayChainError::ServiceError(polkadot_service::Error::Sub(x)) => x,
+		s => s.to_string().into(),
+	})?;
 
 	let force_authoring = parachain_config.force_authoring;
 	let validator = parachain_config.role.is_authority();
@@ -313,15 +313,16 @@ where
 	let transaction_pool = params.transaction_pool.clone();
 	let import_queue_service = params.import_queue.service();
 	let (network, system_rpc_tx, tx_handler_controller, start_network) =
-		sc_service::build_network(sc_service::BuildNetworkParams {
-			config: &parachain_config,
+		cumulus_client_service::build_network(cumulus_client_service::BuildNetworkParams {
+			parachain_config: &parachain_config,
 			client: client.clone(),
 			transaction_pool: transaction_pool.clone(),
+			para_id: id,
 			spawn_handle: task_manager.spawn_handle(),
+			relay_chain_interface: relay_chain_interface.clone(),
 			import_queue: params.import_queue,
-			block_announce_validator_builder: Some(Box::new(|_| Box::new(block_announce_validator))),
-			warp_sync: None,
-		})?;
+		})
+		.await?;
 
 	let rpc_builder = {
 		let client = client.clone();
@@ -372,6 +373,10 @@ where
 
 	let relay_chain_slot_duration = Duration::from_secs(6);
 
+	let overseer_handle = relay_chain_interface
+		.overseer_handle()
+		.map_err(|e| sc_service::Error::Application(Box::new(e)))?;
+
 	if validator {
 		let parachain_consensus = build_consensus(
 			client.clone(),
@@ -400,6 +405,7 @@ where
 			import_queue: import_queue_service,
 			collator_key: collator_key.expect("Command line arguments do not allow this. qed"),
 			relay_chain_slot_duration,
+			recovery_handle: Box::new(overseer_handle),
 		};
 
 		start_collator(params).await?;
@@ -412,6 +418,7 @@ where
 			relay_chain_interface,
 			relay_chain_slot_duration,
 			import_queue: import_queue_service,
+			recovery_handle: Box::new(overseer_handle),
 		};
 
 		start_full_node(params)?;
diff --git a/nodes/standalone/src/command.rs b/nodes/standalone/src/command.rs
index 1cc3992a71..9128925a4c 100644
--- a/nodes/standalone/src/command.rs
+++ b/nodes/standalone/src/command.rs
@@ -197,6 +197,8 @@ pub fn run() -> sc_cli::Result<()> {
 		Some(Subcommand::TryRuntime(cmd)) => {
 			use crate::service::ExecutorDispatch;
 			use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};
+			use try_runtime_cli::block_building_info::timestamp_with_aura_info;
+
 			let runner = cli.create_runner(cmd)?;
 			runner.async_run(|config| {
 				// we don't need any of the components of new_partial, just a runtime, or a task
@@ -204,11 +206,12 @@ pub fn run() -> sc_cli::Result<()> {
 				let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry);
 				let task_manager = sc_service::TaskManager::new(config.tokio_handle.clone(), registry)
 					.map_err(|e| sc_cli::Error::Service(sc_service::Error::Prometheus(e)))?;
+				let info_provider = timestamp_with_aura_info(10_000);
 				Ok((
 					cmd.run::<Block, ExtendedHostFunctions<
 						sp_io::SubstrateHostFunctions,
 						<ExecutorDispatch as NativeExecutionDispatch>::ExtendHostFunctions,
-					>>(),
+					>, _>(Some(info_provider)),
 					task_manager,
 				))
 			})
diff --git a/nodes/standalone/src/service.rs b/nodes/standalone/src/service.rs
index 339d04ac55..0203f0c89f 100644
--- a/nodes/standalone/src/service.rs
+++ b/nodes/standalone/src/service.rs
@@ -24,7 +24,7 @@ use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams};
 pub use sc_executor::NativeElseWasmExecutor;
 use sc_finality_grandpa::SharedVoterState;
 use sc_keystore::LocalKeystore;
-use sc_service::{error::Error as ServiceError, Configuration, TaskManager};
+use sc_service::{error::Error as ServiceError, Configuration, TaskManager, WarpSyncParams};
 use sc_telemetry::{Telemetry, TelemetryWorker};
 use sp_consensus_aura::ed25519::AuthorityPair as AuraPair;
 use std::{sync::Arc, time::Duration};
@@ -204,9 +204,9 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 			client: client.clone(),
 			transaction_pool: transaction_pool.clone(),
 			spawn_handle: task_manager.spawn_handle(),
-			import_queue,
 			block_announce_validator_builder: None,
-			warp_sync: Some(warp_sync),
+			import_queue,
+			warp_sync_params: Some(WarpSyncParams::WithProvider(warp_sync)),
 		})?;
 
 	if config.offchain_worker.enabled {
diff --git a/pallets/attestation/Cargo.toml b/pallets/attestation/Cargo.toml
index e9d8a721b4..d1ca80fbbc 100644
--- a/pallets/attestation/Cargo.toml
+++ b/pallets/attestation/Cargo.toml
@@ -25,7 +25,7 @@ sp-keystore = {workspace = true, features = ["std"]}
 
 [dependencies]
 # External dependencies
-codec = {package = "parity-scale-codec", workspace = true, features = ["derive"]}
+parity-scale-codec = {workspace = true, features = ["derive"]}
 log.workspace = true
 scale-info = {workspace = true, features = ["derive"]}
 
@@ -61,7 +61,7 @@ runtime-benchmarks = [
   "sp-runtime/runtime-benchmarks"
 ]
 std = [
-  "codec/std",
+  "parity-scale-codec/std",
   "ctype/std",
   "frame-benchmarking?/std",
   "frame-support/std",
diff --git a/pallets/attestation/src/attestations.rs b/pallets/attestation/src/attestations.rs
index 349c930b0f..5093d6ba7e 100644
--- a/pallets/attestation/src/attestations.rs
+++ b/pallets/attestation/src/attestations.rs
@@ -16,9 +16,9 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::{Decode, Encode, MaxEncodedLen};
 use ctype::CtypeHashOf;
 use kilt_support::deposit::Deposit;
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 
 use crate::{AccountIdOf, AttesterOf, AuthorizationIdOf, BalanceOf, Config};
diff --git a/pallets/attestation/src/mock.rs b/pallets/attestation/src/mock.rs
index 37eea8c767..ab9eced08f 100644
--- a/pallets/attestation/src/mock.rs
+++ b/pallets/attestation/src/mock.rs
@@ -23,8 +23,8 @@
 //! other tests. Internal functions/structs can only be used in attestation
 //! tests.
 
-use codec::{Decode, Encode};
 use frame_support::{dispatch::Weight, traits::Get};
+use parity_scale_codec::{Decode, Encode};
 use scale_info::TypeInfo;
 use sp_core::H256;
 use sp_runtime::DispatchError;
diff --git a/pallets/attestation/src/tests.rs b/pallets/attestation/src/tests.rs
index 61ca323b7b..96d136ca15 100644
--- a/pallets/attestation/src/tests.rs
+++ b/pallets/attestation/src/tests.rs
@@ -50,7 +50,7 @@ fn test_attest_without_authorization() {
 				authorization_info.clone()
 			));
 			let stored_attestation =
-				Attestation::attestations(&claim_hash).expect("Attestation should be present on chain.");
+				Attestation::attestations(claim_hash).expect("Attestation should be present on chain.");
 
 			assert_eq!(stored_attestation.ctype_hash, ctype_hash);
 			assert_eq!(stored_attestation.attester, attester);
@@ -81,7 +81,7 @@ fn test_attest_authorized() {
 				authorization_info.clone()
 			));
 			let stored_attestation =
-				Attestation::attestations(&claim_hash).expect("Attestation should be present on chain.");
+				Attestation::attestations(claim_hash).expect("Attestation should be present on chain.");
 			assert!(Attestation::external_attestations(attester.clone(), claim_hash));
 
 			assert_eq!(stored_attestation.ctype_hash, ctype);
diff --git a/pallets/ctype/Cargo.toml b/pallets/ctype/Cargo.toml
index 92266dbe7b..deb7e2be4c 100644
--- a/pallets/ctype/Cargo.toml
+++ b/pallets/ctype/Cargo.toml
@@ -21,7 +21,7 @@ sp-keystore = {workspace = true, features = ["std"]}
 
 [dependencies]
 # External dependencies
-codec = {package = "parity-scale-codec", workspace = true, features = ["derive"]}
+parity-scale-codec = {workspace = true, features = ["derive"]}
 log.workspace = true
 scale-info = {workspace = true, features = ["derive"]}
 
@@ -55,7 +55,7 @@ runtime-benchmarks = [
   "sp-runtime/runtime-benchmarks",
 ]
 std = [
-  "codec/std",
+  "parity-scale-codec/std",
   "frame-benchmarking?/std",
   "frame-support/std",
   "frame-system/std",
diff --git a/pallets/ctype/src/ctype_entry.rs b/pallets/ctype/src/ctype_entry.rs
index 6a0cbd2c7f..96846c994c 100644
--- a/pallets/ctype/src/ctype_entry.rs
+++ b/pallets/ctype/src/ctype_entry.rs
@@ -1,5 +1,5 @@
-use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::RuntimeDebug;
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 
 /// Creation details of a CType.
diff --git a/pallets/ctype/src/tests.rs b/pallets/ctype/src/tests.rs
index d371310282..463164c301 100644
--- a/pallets/ctype/src/tests.rs
+++ b/pallets/ctype/src/tests.rs
@@ -42,7 +42,7 @@ fn check_successful_ctype_creation() {
 				DoubleOrigin(deposit_owner.clone(), creator.clone()).into(),
 				ctype
 			));
-			let stored_ctype_creator = Ctype::ctypes(&ctype_hash).expect("CType hash should be present on chain.");
+			let stored_ctype_creator = Ctype::ctypes(ctype_hash).expect("CType hash should be present on chain.");
 
 			// Verify the CType has the right owner and block number
 			assert_eq!(
diff --git a/pallets/delegation/Cargo.toml b/pallets/delegation/Cargo.toml
index d597683482..552c3ef50f 100644
--- a/pallets/delegation/Cargo.toml
+++ b/pallets/delegation/Cargo.toml
@@ -32,7 +32,7 @@ public-credentials.workspace = true
 
 # External dependencies
 bitflags.workspace = true
-codec = {package = "parity-scale-codec", workspace = true, features = ["derive"]}
+parity-scale-codec = {workspace = true, features = ["derive"]}
 log.workspace = true
 scale-info = {workspace = true, features = ["derive"]}
 
@@ -68,7 +68,7 @@ runtime-benchmarks = [
 ]
 std = [
   "attestation/std",
-  "codec/std",
+  "parity-scale-codec/std",
   "ctype/std",
   "frame-benchmarking?/std",
   "frame-support/std",
diff --git a/pallets/delegation/src/access_control.rs b/pallets/delegation/src/access_control.rs
index f48510eaaf..a57d83f088 100644
--- a/pallets/delegation/src/access_control.rs
+++ b/pallets/delegation/src/access_control.rs
@@ -16,8 +16,8 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{dispatch::Weight, ensure};
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::DispatchError;
 
@@ -269,7 +269,7 @@ mod tests {
 					ac_info.clone()
 				));
 				let stored_attestation =
-					Attestation::attestations(&claim_hash).expect("Attestation should be present on chain.");
+					Attestation::attestations(claim_hash).expect("Attestation should be present on chain.");
 
 				assert_eq!(stored_attestation.ctype_hash, ctype_hash);
 				assert_eq!(stored_attestation.attester, delegate);
diff --git a/pallets/delegation/src/benchmarking.rs b/pallets/delegation/src/benchmarking.rs
index 01133d647c..527c8946b0 100644
--- a/pallets/delegation/src/benchmarking.rs
+++ b/pallets/delegation/src/benchmarking.rs
@@ -18,7 +18,6 @@
 
 use super::*;
 
-use codec::Encode;
 use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite};
 use frame_support::{
 	dispatch::DispatchErrorWithPostInfo,
@@ -26,6 +25,7 @@ use frame_support::{
 	traits::{Currency, Get},
 };
 use frame_system::RawOrigin;
+use parity_scale_codec::Encode;
 use sp_core::{offchain::KeyTypeId, sr25519};
 use sp_io::crypto::sr25519_generate;
 use sp_runtime::traits::Zero;
diff --git a/pallets/delegation/src/delegation_hierarchy.rs b/pallets/delegation/src/delegation_hierarchy.rs
index a7f2cf0d8d..dc6fd8a331 100644
--- a/pallets/delegation/src/delegation_hierarchy.rs
+++ b/pallets/delegation/src/delegation_hierarchy.rs
@@ -18,10 +18,10 @@
 
 use crate::{AccountIdOf, BalanceOf, Config, DelegationNodeIdOf, DelegatorIdOf, Error};
 use bitflags::bitflags;
-use codec::{Decode, Encode, MaxEncodedLen};
 use ctype::CtypeHashOf;
 use frame_support::{dispatch::DispatchResult, storage::bounded_btree_set::BoundedBTreeSet};
 use kilt_support::deposit::Deposit;
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 
 bitflags! {
diff --git a/pallets/delegation/src/lib.rs b/pallets/delegation/src/lib.rs
index 485a824cc6..6f99c9f040 100644
--- a/pallets/delegation/src/lib.rs
+++ b/pallets/delegation/src/lib.rs
@@ -78,7 +78,6 @@ mod tests;
 
 pub use crate::{access_control::DelegationAc, default_weights::WeightInfo, delegation_hierarchy::*, pallet::*};
 
-use codec::Encode;
 use frame_support::{
 	dispatch::DispatchResult,
 	ensure,
@@ -86,6 +85,7 @@ use frame_support::{
 	traits::{Get, ReservableCurrency},
 };
 use kilt_support::traits::StorageDepositCollector;
+use parity_scale_codec::Encode;
 use sp_runtime::{traits::Hash, DispatchError};
 use sp_std::{marker::PhantomData, vec::Vec};
 
diff --git a/pallets/delegation/src/mock.rs b/pallets/delegation/src/mock.rs
index 01b95d6909..8278353f32 100644
--- a/pallets/delegation/src/mock.rs
+++ b/pallets/delegation/src/mock.rs
@@ -173,9 +173,9 @@ pub(crate) mod runtime {
 
 	use super::*;
 
-	use codec::Encode;
 	use frame_support::{parameter_types, weights::constants::RocksDbWeight};
 	use frame_system::EnsureSigned;
+	use parity_scale_codec::Encode;
 	use sp_core::{ed25519, sr25519, Pair};
 	use sp_runtime::{
 		testing::Header,
diff --git a/pallets/delegation/src/tests.rs b/pallets/delegation/src/tests.rs
index e97f0fb0d9..32f17f62ba 100644
--- a/pallets/delegation/src/tests.rs
+++ b/pallets/delegation/src/tests.rs
@@ -51,13 +51,13 @@ fn create_root_delegation_successful() {
 			assert_eq!(Balances::reserved_balance(ACCOUNT_00), <Test as Config>::Deposit::get());
 
 			// Get stored hierarchy
-			let stored_hierarchy_details = Delegation::delegation_hierarchies(&hierarchy_root_id)
+			let stored_hierarchy_details = Delegation::delegation_hierarchies(hierarchy_root_id)
 				.expect("Delegation hierarchy should be present on chain.");
 			assert_eq!(stored_hierarchy_details.ctype_hash, operation.ctype_hash);
 
 			// Check root delegation
 			let stored_delegation_root =
-				Delegation::delegation_nodes(&hierarchy_root_id).expect("Delegation root should be present on chain.");
+				Delegation::delegation_nodes(hierarchy_root_id).expect("Delegation root should be present on chain.");
 			assert_eq!(stored_delegation_root.hierarchy_root_id, hierarchy_root_id);
 			assert!(stored_delegation_root.parent.is_none());
 			assert!(stored_delegation_root.children.len().is_zero());
@@ -178,7 +178,7 @@ fn create_delegation_direct_root_successful() {
 
 			// Check stored delegation against operation
 			let stored_delegation =
-				Delegation::delegation_nodes(&operation.delegation_id).expect("Delegation should be present on chain.");
+				Delegation::delegation_nodes(operation.delegation_id).expect("Delegation should be present on chain.");
 			assert_eq!(stored_delegation.hierarchy_root_id, operation.hierarchy_id);
 			assert_eq!(stored_delegation.parent, Some(operation.parent_id));
 			assert!(stored_delegation.children.is_empty());
@@ -187,7 +187,7 @@ fn create_delegation_direct_root_successful() {
 			assert!(!stored_delegation.details.revoked);
 
 			// Verify that the root has the new delegation among its children
-			let stored_root = Delegation::delegation_nodes(&operation.hierarchy_id)
+			let stored_root = Delegation::delegation_nodes(operation.hierarchy_id)
 				.expect("Delegation root should be present on chain.");
 			assert!(stored_root.children.contains(&operation.delegation_id));
 		});
@@ -258,7 +258,7 @@ fn create_delegation_with_parent_successful() {
 
 			// Data in stored delegation and operation should match
 			let stored_delegation =
-				Delegation::delegation_nodes(&operation.delegation_id).expect("Delegation should be present on chain.");
+				Delegation::delegation_nodes(operation.delegation_id).expect("Delegation should be present on chain.");
 			assert_eq!(stored_delegation.hierarchy_root_id, operation.hierarchy_id);
 			assert_eq!(stored_delegation.parent, Some(operation.parent_id));
 			assert!(stored_delegation.children.is_empty());
@@ -269,7 +269,7 @@ fn create_delegation_with_parent_successful() {
 
 			// Verify that the parent has the new delegation among its children
 			let stored_parent =
-				Delegation::delegation_nodes(&operation.parent_id).expect("Delegation parent be present on chain.");
+				Delegation::delegation_nodes(operation.parent_id).expect("Delegation parent be present on chain.");
 
 			assert!(stored_parent.children.contains(&operation.delegation_id));
 		});
@@ -659,7 +659,7 @@ fn empty_revoke_root_successful() {
 			));
 
 			assert!(
-				Delegation::delegation_nodes(&operation.id)
+				Delegation::delegation_nodes(operation.id)
 					.expect("Delegation root should be present on chain.")
 					.details
 					.revoked
@@ -699,7 +699,7 @@ fn list_hierarchy_revoke_and_remove_root_successful() {
 		.with_delegations(vec![(parent_id, parent_node), (delegation_id, delegation_node)])
 		.build()
 		.execute_with(|| {
-			assert!(Delegation::delegation_hierarchies(&hierarchy_root_id).is_some());
+			assert!(Delegation::delegation_hierarchies(hierarchy_root_id).is_some());
 			assert_eq!(
 				Balances::reserved_balance(ACCOUNT_00),
 				2 * <Test as Config>::Deposit::get()
@@ -716,19 +716,19 @@ fn list_hierarchy_revoke_and_remove_root_successful() {
 
 			// Root and children should still be stored with revoked status
 			assert!(
-				Delegation::delegation_nodes(&operation.id)
+				Delegation::delegation_nodes(operation.id)
 					.expect("Delegation root should be present on chain.")
 					.details
 					.revoked
 			);
 			assert!(
-				Delegation::delegation_nodes(&parent_id)
+				Delegation::delegation_nodes(parent_id)
 					.expect("Parent delegation should be present on chain.")
 					.details
 					.revoked
 			);
 			assert!(
-				Delegation::delegation_nodes(&delegation_id)
+				Delegation::delegation_nodes(delegation_id)
 					.expect("Delegation should be present on chain.")
 					.details
 					.revoked
@@ -741,10 +741,10 @@ fn list_hierarchy_revoke_and_remove_root_successful() {
 				operation.max_children
 			));
 
-			assert!(Delegation::delegation_nodes(&operation.id).is_none());
-			assert!(Delegation::delegation_hierarchies(&hierarchy_root_id).is_none());
-			assert!(Delegation::delegation_nodes(&parent_id).is_none());
-			assert!(Delegation::delegation_nodes(&delegation_id).is_none());
+			assert!(Delegation::delegation_nodes(operation.id).is_none());
+			assert!(Delegation::delegation_hierarchies(hierarchy_root_id).is_none());
+			assert!(Delegation::delegation_nodes(parent_id).is_none());
+			assert!(Delegation::delegation_nodes(delegation_id).is_none());
 			assert!(Balances::reserved_balance(ACCOUNT_00).is_zero());
 			assert!(Balances::reserved_balance(ACCOUNT_01).is_zero());
 		});
@@ -796,19 +796,19 @@ fn tree_hierarchy_revoke_and_remove_root_successful() {
 
 			// Root and children should still be stored with revoked status
 			assert!(
-				Delegation::delegation_nodes(&operation.id)
+				Delegation::delegation_nodes(operation.id)
 					.expect("Delegation root should be present on chain.")
 					.details
 					.revoked
 			);
 			assert!(
-				Delegation::delegation_nodes(&delegation1_id)
+				Delegation::delegation_nodes(delegation1_id)
 					.expect("Delegation 1 should be present on chain.")
 					.details
 					.revoked
 			);
 			assert!(
-				Delegation::delegation_nodes(&delegation2_id)
+				Delegation::delegation_nodes(delegation2_id)
 					.expect("Delegation 2 should be present on chain.")
 					.details
 					.revoked
@@ -827,10 +827,10 @@ fn tree_hierarchy_revoke_and_remove_root_successful() {
 				operation.max_children
 			));
 
-			assert!(Delegation::delegation_nodes(&operation.id).is_none());
-			assert!(Delegation::delegation_hierarchies(&hierarchy_root_id).is_none());
-			assert!(Delegation::delegation_nodes(&delegation1_id).is_none());
-			assert!(Delegation::delegation_nodes(&delegation2_id).is_none());
+			assert!(Delegation::delegation_nodes(operation.id).is_none());
+			assert!(Delegation::delegation_hierarchies(hierarchy_root_id).is_none());
+			assert!(Delegation::delegation_nodes(delegation1_id).is_none());
+			assert!(Delegation::delegation_nodes(delegation2_id).is_none());
 			assert!(Balances::reserved_balance(ACCOUNT_00).is_zero());
 			assert!(Balances::reserved_balance(ACCOUNT_01).is_zero());
 		});
@@ -878,19 +878,19 @@ fn max_max_revocations_revoke_and_remove_successful() {
 
 			// Root and children should still be stored with revoked status
 			assert!(
-				Delegation::delegation_nodes(&operation.id)
+				Delegation::delegation_nodes(operation.id)
 					.expect("Delegation root should be present on chain.")
 					.details
 					.revoked
 			);
 			assert!(
-				Delegation::delegation_nodes(&parent_id)
+				Delegation::delegation_nodes(parent_id)
 					.expect("Parent delegation should be present on chain.")
 					.details
 					.revoked
 			);
 			assert!(
-				Delegation::delegation_nodes(&delegation_id)
+				Delegation::delegation_nodes(delegation_id)
 					.expect("Delegation should be present on chain.")
 					.details
 					.revoked
@@ -909,10 +909,10 @@ fn max_max_revocations_revoke_and_remove_successful() {
 				operation.max_children
 			));
 
-			assert!(Delegation::delegation_nodes(&operation.id).is_none());
-			assert!(Delegation::delegation_hierarchies(&hierarchy_root_id).is_none());
-			assert!(Delegation::delegation_nodes(&parent_id).is_none());
-			assert!(Delegation::delegation_nodes(&delegation_id).is_none());
+			assert!(Delegation::delegation_nodes(operation.id).is_none());
+			assert!(Delegation::delegation_hierarchies(hierarchy_root_id).is_none());
+			assert!(Delegation::delegation_nodes(parent_id).is_none());
+			assert!(Delegation::delegation_nodes(delegation_id).is_none());
 			assert!(Balances::reserved_balance(ACCOUNT_00).is_zero());
 			assert!(Balances::reserved_balance(ACCOUNT_01).is_zero());
 		});
@@ -1094,25 +1094,25 @@ fn exact_children_max_revocations_revoke_and_remove_root_error() {
 
 			// No delegation should have been revoked because of transactional storage layer
 			assert!(
-				!Delegation::delegation_nodes(&operation.id)
+				!Delegation::delegation_nodes(operation.id)
 					.expect("Delegation root should be present on chain.")
 					.details
 					.revoked
 			);
 			assert!(
-				!Delegation::delegation_nodes(&delegation1_id)
+				!Delegation::delegation_nodes(delegation1_id)
 					.expect("Delegation 1 should be present on chain.")
 					.details
 					.revoked
 			);
 			assert!(
-				!Delegation::delegation_nodes(&delegation2_id)
+				!Delegation::delegation_nodes(delegation2_id)
 					.expect("Delegation 2 should be present on chain.")
 					.details
 					.revoked
 			);
 			assert!(
-				!Delegation::delegation_nodes(&delegation3_id)
+				!Delegation::delegation_nodes(delegation3_id)
 					.expect("Delegation 3 should be present on chain.")
 					.details
 					.revoked
@@ -1135,10 +1135,10 @@ fn exact_children_max_revocations_revoke_and_remove_root_error() {
 				Error::<Test>::ExceededRemovalBounds
 			);
 			// Should not remove any delegation because of transactional storage layer
-			assert!(Delegation::delegation_nodes(&operation.id).is_some());
-			assert!(Delegation::delegation_nodes(&delegation1_id).is_some());
-			assert!(Delegation::delegation_nodes(&delegation2_id).is_some());
-			assert!(Delegation::delegation_nodes(&delegation3_id).is_some());
+			assert!(Delegation::delegation_nodes(operation.id).is_some());
+			assert!(Delegation::delegation_nodes(delegation1_id).is_some());
+			assert!(Delegation::delegation_nodes(delegation2_id).is_some());
+			assert!(Delegation::delegation_nodes(delegation3_id).is_some());
 			assert_eq!(Balances::reserved_balance(ACCOUNT_00), <Test as Config>::Deposit::get());
 			assert_eq!(
 				Balances::reserved_balance(ACCOUNT_01),
@@ -1151,9 +1151,9 @@ fn exact_children_max_revocations_revoke_and_remove_root_error() {
 				operation.id,
 				operation.max_children + 1
 			));
-			assert!(Delegation::delegation_nodes(&operation.id).is_none());
-			assert!(Delegation::delegation_nodes(&delegation1_id).is_none());
-			assert!(Delegation::delegation_nodes(&delegation3_id).is_none());
+			assert!(Delegation::delegation_nodes(operation.id).is_none());
+			assert!(Delegation::delegation_nodes(delegation1_id).is_none());
+			assert!(Delegation::delegation_nodes(delegation3_id).is_none());
 			assert!(Balances::reserved_balance(ACCOUNT_00).is_zero());
 			assert!(Balances::reserved_balance(ACCOUNT_01).is_zero());
 		});
@@ -1206,19 +1206,19 @@ fn direct_owner_revoke_and_remove_delegation_successful() {
 
 			// Root hierarchy and children should still be stored with revoked status
 			assert!(
-				Delegation::delegation_nodes(&operation.delegation_id)
+				Delegation::delegation_nodes(operation.delegation_id)
 					.expect("Delegation root should be present on chain.")
 					.details
 					.revoked
 			);
 			assert!(
-				Delegation::delegation_nodes(&parent_id)
+				Delegation::delegation_nodes(parent_id)
 					.expect("Parent delegation should be present on chain.")
 					.details
 					.revoked
 			);
 			assert!(
-				Delegation::delegation_nodes(&delegation_id)
+				Delegation::delegation_nodes(delegation_id)
 					.expect("Delegation should be present on chain.")
 					.details
 					.revoked
@@ -1237,10 +1237,10 @@ fn direct_owner_revoke_and_remove_delegation_successful() {
 				operation.max_revocations
 			));
 
-			assert!(Delegation::delegation_hierarchies(&hierarchy_root_id).is_some());
-			assert!(Delegation::delegation_nodes(&operation.delegation_id).is_none());
-			assert!(Delegation::delegation_nodes(&parent_id).is_none());
-			assert!(Delegation::delegation_nodes(&delegation_id).is_none());
+			assert!(Delegation::delegation_hierarchies(hierarchy_root_id).is_some());
+			assert!(Delegation::delegation_nodes(operation.delegation_id).is_none());
+			assert!(Delegation::delegation_nodes(parent_id).is_none());
+			assert!(Delegation::delegation_nodes(delegation_id).is_none());
 			assert_eq!(Balances::reserved_balance(ACCOUNT_00), <Test as Config>::Deposit::get());
 			assert!(Balances::reserved_balance(ACCOUNT_01).is_zero());
 		});
@@ -1306,13 +1306,13 @@ fn parent_owner_revoke_delegation_successful() {
 
 			// Only child should be revoked
 			assert!(
-				!Delegation::delegation_nodes(&parent_id)
+				!Delegation::delegation_nodes(parent_id)
 					.expect("Parent delegation should be present on chain.")
 					.details
 					.revoked
 			);
 			assert!(
-				Delegation::delegation_nodes(&delegation_id)
+				Delegation::delegation_nodes(delegation_id)
 					.expect("Delegation should be present on chain.")
 					.details
 					.revoked
@@ -1325,8 +1325,8 @@ fn parent_owner_revoke_delegation_successful() {
 				operation.max_revocations
 			));
 
-			assert!(Delegation::delegation_nodes(&parent_id).is_some());
-			assert!(Delegation::delegation_nodes(&delegation_id).is_none());
+			assert!(Delegation::delegation_nodes(parent_id).is_some());
+			assert!(Delegation::delegation_nodes(delegation_id).is_none());
 			assert_eq!(
 				Balances::reserved_balance(ACCOUNT_00),
 				2 * <Test as Config>::Deposit::get()
@@ -1570,9 +1570,9 @@ fn direct_owner_reclaim_deposit_delegation_successful() {
 			));
 
 			// Root hierarchy and children should not be stored anymore
-			assert!(Delegation::delegation_nodes(&operation.delegation_id).is_none());
-			assert!(Delegation::delegation_nodes(&parent_id).is_none());
-			assert!(Delegation::delegation_nodes(&delegation_id).is_none());
+			assert!(Delegation::delegation_nodes(operation.delegation_id).is_none());
+			assert!(Delegation::delegation_nodes(parent_id).is_none());
+			assert!(Delegation::delegation_nodes(delegation_id).is_none());
 
 			// We have released all the deposits by deleting the root node.
 			assert!(Balances::reserved_balance(ACCOUNT_00).is_zero());
@@ -2147,12 +2147,12 @@ fn remove_children_gas_runs_out() {
 				),
 				Error::<Test>::ExceededRemovalBounds
 			);
-			assert!(Delegation::delegation_nodes(&operation.id).is_some());
-			assert!(Delegation::delegation_nodes(&delegation1_id).is_some());
+			assert!(Delegation::delegation_nodes(operation.id).is_some());
+			assert!(Delegation::delegation_nodes(delegation1_id).is_some());
 			// Should still be existing because of transactional storage
-			assert!(Delegation::delegation_nodes(&delegation2_id).is_some());
-			assert!(Delegation::delegation_nodes(&delegation3_id).is_some());
-			assert!(Delegation::delegation_nodes(&delegation4_id).is_some());
+			assert!(Delegation::delegation_nodes(delegation2_id).is_some());
+			assert!(Delegation::delegation_nodes(delegation3_id).is_some());
+			assert!(Delegation::delegation_nodes(delegation4_id).is_some());
 			assert_eq!(Balances::reserved_balance(ACCOUNT_00), <Test as Config>::Deposit::get());
 			assert_eq!(
 				Balances::reserved_balance(ACCOUNT_01),
@@ -2166,10 +2166,10 @@ fn remove_children_gas_runs_out() {
 				operation.id,
 				operation.max_children + 1
 			));
-			assert!(Delegation::delegation_nodes(&operation.id).is_none());
-			assert!(Delegation::delegation_nodes(&delegation1_id).is_none());
-			assert!(Delegation::delegation_nodes(&delegation2_id).is_none());
-			assert!(Delegation::delegation_nodes(&delegation3_id).is_none());
+			assert!(Delegation::delegation_nodes(operation.id).is_none());
+			assert!(Delegation::delegation_nodes(delegation1_id).is_none());
+			assert!(Delegation::delegation_nodes(delegation2_id).is_none());
+			assert!(Delegation::delegation_nodes(delegation3_id).is_none());
 			assert!(Balances::reserved_balance(ACCOUNT_00).is_zero());
 			assert!(Balances::reserved_balance(ACCOUNT_01).is_zero());
 			assert!(Balances::reserved_balance(ACCOUNT_02).is_zero());
diff --git a/pallets/did/Cargo.toml b/pallets/did/Cargo.toml
index fe9ffe97c0..05ebda75dc 100644
--- a/pallets/did/Cargo.toml
+++ b/pallets/did/Cargo.toml
@@ -32,7 +32,7 @@ kilt-support.workspace = true
 ctype = {workspace = true, optional = true}
 
 # Substrate dependencies
-codec = {package = "parity-scale-codec", workspace = true, features = ["derive"]}
+parity-scale-codec = {workspace = true, features = ["derive"]}
 frame-support.workspace = true
 frame-system.workspace = true
 scale-info = {workspace = true, features = ["derive"]}
@@ -63,7 +63,7 @@ runtime-benchmarks = [
   "sp-runtime/runtime-benchmarks",
 ]
 std = [
-  "codec/std",
+  "parity-scale-codec/std",
   "ctype/std",
   "frame-support/std",
   "frame-system/std",
diff --git a/pallets/did/src/benchmarking.rs b/pallets/did/src/benchmarking.rs
index e10251d28e..4f1995f0b5 100644
--- a/pallets/did/src/benchmarking.rs
+++ b/pallets/did/src/benchmarking.rs
@@ -18,13 +18,13 @@
 
 use super::*;
 
-use codec::Encode;
 use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, Zero};
 use frame_support::{
 	assert_ok,
 	traits::{Currency, ReservableCurrency},
 };
 use frame_system::RawOrigin;
+use parity_scale_codec::Encode;
 use sp_core::{crypto::KeyTypeId, ecdsa, ed25519, sr25519};
 use sp_io::crypto::{ecdsa_generate, ecdsa_sign, ed25519_generate, ed25519_sign, sr25519_generate, sr25519_sign};
 use sp_runtime::{traits::IdentifyAccount, AccountId32, MultiSigner};
diff --git a/pallets/did/src/did_details.rs b/pallets/did/src/did_details.rs
index c0437277e0..254865c9bc 100644
--- a/pallets/did/src/did_details.rs
+++ b/pallets/did/src/did_details.rs
@@ -16,13 +16,13 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::{Decode, Encode, MaxEncodedLen, WrapperTypeEncode};
 use frame_support::{
 	ensure,
 	storage::{bounded_btree_map::BoundedBTreeMap, bounded_btree_set::BoundedBTreeSet},
 	traits::Get,
 	RuntimeDebug,
 };
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen, WrapperTypeEncode};
 use scale_info::TypeInfo;
 use sp_core::{ecdsa, ed25519, sr25519};
 use sp_runtime::{traits::Verify, MultiSignature, SaturatedConversion};
diff --git a/pallets/did/src/lib.rs b/pallets/did/src/lib.rs
index b62c29f206..9d1df0d306 100644
--- a/pallets/did/src/lib.rs
+++ b/pallets/did/src/lib.rs
@@ -113,7 +113,6 @@ pub use crate::{
 
 use errors::{DidError, InputError, SignatureError, StorageError};
 
-use codec::Encode;
 use frame_support::{
 	dispatch::{DispatchResult, Dispatchable, GetDispatchInfo, PostDispatchInfo},
 	ensure,
@@ -122,6 +121,7 @@ use frame_support::{
 	Parameter,
 };
 use frame_system::ensure_signed;
+use parity_scale_codec::Encode;
 use sp_runtime::{
 	traits::{Saturating, Zero},
 	SaturatedConversion,
diff --git a/pallets/did/src/origin.rs b/pallets/did/src/origin.rs
index a1ccac4415..f027afb546 100644
--- a/pallets/did/src/origin.rs
+++ b/pallets/did/src/origin.rs
@@ -16,12 +16,12 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::MaxEncodedLen;
 use frame_support::{
 	codec::{Decode, Encode},
 	traits::EnsureOrigin,
 };
 use kilt_support::traits::CallSources;
+use parity_scale_codec::MaxEncodedLen;
 use scale_info::TypeInfo;
 use sp_runtime::RuntimeDebug;
 use sp_std::marker::PhantomData;
diff --git a/pallets/did/src/service_endpoints.rs b/pallets/did/src/service_endpoints.rs
index d2d880deec..f7f1572880 100644
--- a/pallets/did/src/service_endpoints.rs
+++ b/pallets/did/src/service_endpoints.rs
@@ -17,8 +17,8 @@
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
 use crate::{errors, Config};
-use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{ensure, traits::Get, BoundedVec, RuntimeDebug};
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::traits::SaturatedConversion;
 use sp_std::str;
diff --git a/pallets/did/src/tests.rs b/pallets/did/src/tests.rs
index 4dfa182141..804fde6031 100644
--- a/pallets/did/src/tests.rs
+++ b/pallets/did/src/tests.rs
@@ -16,8 +16,8 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::Encode;
 use frame_support::{assert_err, assert_noop, assert_ok, traits::Currency};
+use parity_scale_codec::Encode;
 use sp_core::{ed25519, Pair};
 use sp_runtime::{
 	traits::{BadOrigin, Hash, Zero},
diff --git a/pallets/did/src/utils.rs b/pallets/did/src/utils.rs
index 52ddfcb6b6..35b6f7de68 100644
--- a/pallets/did/src/utils.rs
+++ b/pallets/did/src/utils.rs
@@ -16,7 +16,7 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::Encode;
+use parity_scale_codec::Encode;
 use sp_runtime::traits::Hash;
 use sp_std::vec::Vec;
 
diff --git a/pallets/pallet-did-lookup/Cargo.toml b/pallets/pallet-did-lookup/Cargo.toml
index 1bbd4637d4..654144e311 100644
--- a/pallets/pallet-did-lookup/Cargo.toml
+++ b/pallets/pallet-did-lookup/Cargo.toml
@@ -27,7 +27,7 @@ test-log = "0.2.11"
 # External dependencies
 base58.workspace = true
 blake2 = {version = "0.10.6", default-features = false}
-codec = {package = "parity-scale-codec", workspace = true, features = ["derive"]}
+parity-scale-codec = {workspace = true, features = ["derive"]}
 hex.workspace = true
 libsecp256k1 = {workspace = true, features = ["hmac"]}
 log.workspace = true
@@ -62,7 +62,7 @@ runtime-benchmarks = [
 ]
 std = [
   "blake2/std",
-  "codec/std",
+  "parity-scale-codec/std",
   "frame-benchmarking?/std",
   "frame-support/std",
   "frame-system/std",
diff --git a/pallets/pallet-did-lookup/src/account.rs b/pallets/pallet-did-lookup/src/account.rs
index 67bbd7531b..9e112bf64a 100644
--- a/pallets/pallet-did-lookup/src/account.rs
+++ b/pallets/pallet-did-lookup/src/account.rs
@@ -23,8 +23,8 @@
 //!
 //! It includes the Verify and IdentifyAccount traits for the AccountId20
 
-use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{crypto::ecdsa::ECDSAExt, RuntimeDebug};
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sha3::{Digest, Keccak256};
 use sp_core::{ecdsa, H160, H256};
diff --git a/pallets/pallet-did-lookup/src/associate_account_request.rs b/pallets/pallet-did-lookup/src/associate_account_request.rs
index 7ab93b42b3..04d03292eb 100644
--- a/pallets/pallet-did-lookup/src/associate_account_request.rs
+++ b/pallets/pallet-did-lookup/src/associate_account_request.rs
@@ -24,7 +24,7 @@ use crate::{
 
 use base58::ToBase58;
 use blake2::{Blake2b512, Digest};
-use codec::{Decode, Encode, MaxEncodedLen};
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::{
 	prelude::{format, string::String},
 	TypeInfo,
diff --git a/pallets/pallet-did-lookup/src/connection_record.rs b/pallets/pallet-did-lookup/src/connection_record.rs
index e6967dab30..bcfee9e72d 100644
--- a/pallets/pallet-did-lookup/src/connection_record.rs
+++ b/pallets/pallet-did-lookup/src/connection_record.rs
@@ -16,8 +16,8 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::{Decode, Encode, MaxEncodedLen};
 use kilt_support::deposit::Deposit;
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 
 /// A record in the ConnectedDid map.
diff --git a/pallets/pallet-did-lookup/src/linkable_account.rs b/pallets/pallet-did-lookup/src/linkable_account.rs
index f7b6806929..0f2e97b570 100644
--- a/pallets/pallet-did-lookup/src/linkable_account.rs
+++ b/pallets/pallet-did-lookup/src/linkable_account.rs
@@ -16,7 +16,7 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::{Decode, Encode, MaxEncodedLen};
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::AccountId32;
 
diff --git a/pallets/pallet-did-lookup/src/migration_state.rs b/pallets/pallet-did-lookup/src/migration_state.rs
index 30f531424e..9f6afd7742 100644
--- a/pallets/pallet-did-lookup/src/migration_state.rs
+++ b/pallets/pallet-did-lookup/src/migration_state.rs
@@ -16,7 +16,7 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::{Decode, Encode, MaxEncodedLen};
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 
 use crate::migrations::MixedStorageKey;
diff --git a/pallets/pallet-did-lookup/src/migrations.rs b/pallets/pallet-did-lookup/src/migrations.rs
index bad1dca8f8..e51e049cc4 100644
--- a/pallets/pallet-did-lookup/src/migrations.rs
+++ b/pallets/pallet-did-lookup/src/migrations.rs
@@ -22,13 +22,13 @@ use crate::{
 	MigrationStateStore, Pallet,
 };
 
-use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
 	storage::KeyPrefixIterator,
 	storage_alias,
 	traits::{Get, GetStorageVersion, OnRuntimeUpgrade, StorageVersion},
 	Blake2_128Concat, ReversibleStorageHasher, StoragePrefixedMap, LOG_TARGET,
 };
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::{AccountId32, DispatchError};
 use sp_std::marker::PhantomData;
@@ -83,7 +83,7 @@ pub(crate) fn get_mixed_storage_iterator<T: Config>(
 				// This should not happen
 				l => {
 					log::error!("Unknown size {}", l);
-					Err(codec::Error::from("Unknown key size"))
+					Err(parity_scale_codec::Error::from("Unknown key size"))
 				}
 			}
 		},
diff --git a/pallets/pallet-did-lookup/src/signature.rs b/pallets/pallet-did-lookup/src/signature.rs
index 5775506b1f..fd36b37855 100644
--- a/pallets/pallet-did-lookup/src/signature.rs
+++ b/pallets/pallet-did-lookup/src/signature.rs
@@ -16,7 +16,7 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::alloc::string::ToString;
+use parity_scale_codec::alloc::string::ToString;
 use sp_std::vec::Vec;
 
 // According to https://github.com/polkadot-js/common/blob/5d5c7e4c0ace06e3301ccadfd3c3351955f1e251/packages/util/src/u8a/wrap.ts#L13
diff --git a/pallets/pallet-did-lookup/src/tests.rs b/pallets/pallet-did-lookup/src/tests.rs
index bede8ac86a..48a694576c 100644
--- a/pallets/pallet-did-lookup/src/tests.rs
+++ b/pallets/pallet-did-lookup/src/tests.rs
@@ -16,9 +16,9 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::Encode;
 use frame_support::{assert_noop, assert_ok, assert_storage_noop, crypto::ecdsa::ECDSAExt};
 use kilt_support::{deposit::Deposit, mock::mock_origin};
+use parity_scale_codec::Encode;
 use sha3::{Digest, Keccak256};
 use sp_runtime::{
 	app_crypto::{ecdsa, sr25519, Pair},
diff --git a/pallets/pallet-inflation/Cargo.toml b/pallets/pallet-inflation/Cargo.toml
index 303312b53c..59dcc2b0d8 100644
--- a/pallets/pallet-inflation/Cargo.toml
+++ b/pallets/pallet-inflation/Cargo.toml
@@ -20,7 +20,7 @@ sp-io = {workspace = true, features = ["std"]}
 
 [dependencies]
 # External dependencies
-codec = {package = "parity-scale-codec", workspace = true, features = ["derive"]}
+parity-scale-codec = {workspace = true, features = ["derive"]}
 scale-info = {workspace = true, features = ["derive"]}
 
 # Benchmarking dependencies
@@ -41,7 +41,7 @@ runtime-benchmarks = [
   "sp-runtime/runtime-benchmarks",
 ]
 std = [
-  "codec/std",
+  "parity-scale-codec/std",
   "frame-benchmarking?/std",
   "frame-support/std",
   "frame-system/std",
diff --git a/pallets/pallet-web3-names/Cargo.toml b/pallets/pallet-web3-names/Cargo.toml
index 60bac0a750..2706a25ddb 100644
--- a/pallets/pallet-web3-names/Cargo.toml
+++ b/pallets/pallet-web3-names/Cargo.toml
@@ -23,7 +23,7 @@ sp-keystore = {workspace = true, features = ["std"]}
 
 [dependencies]
 # External dependencies
-codec = {package = "parity-scale-codec", workspace = true, features = ["derive"]}
+parity-scale-codec = {workspace = true, features = ["derive"]}
 scale-info = {workspace = true, features = ["derive"]}
 
 # Internal dependencies
@@ -50,7 +50,7 @@ runtime-benchmarks = [
   "sp-runtime/runtime-benchmarks",
 ]
 std = [
-  "codec/std",
+  "parity-scale-codec/std",
   "frame-benchmarking?/std",
   "frame-support/std",
   "frame-system/std",
diff --git a/pallets/pallet-web3-names/src/lib.rs b/pallets/pallet-web3-names/src/lib.rs
index 0fbe051944..c50f57cabd 100644
--- a/pallets/pallet-web3-names/src/lib.rs
+++ b/pallets/pallet-web3-names/src/lib.rs
@@ -38,7 +38,6 @@ pub use crate::{default_weights::WeightInfo, pallet::*};
 
 #[frame_support::pallet]
 pub mod pallet {
-	use codec::FullCodec;
 	use frame_support::{
 		pallet_prelude::*,
 		sp_runtime::SaturatedConversion,
@@ -46,6 +45,7 @@ pub mod pallet {
 		Blake2_128Concat,
 	};
 	use frame_system::pallet_prelude::*;
+	use parity_scale_codec::FullCodec;
 	use sp_std::{fmt::Debug, vec::Vec};
 
 	use kilt_support::{
diff --git a/pallets/pallet-web3-names/src/web3_name.rs b/pallets/pallet-web3-names/src/web3_name.rs
index 568e7f1b07..37b393a16d 100644
--- a/pallets/pallet-web3-names/src/web3_name.rs
+++ b/pallets/pallet-web3-names/src/web3_name.rs
@@ -18,8 +18,8 @@
 
 use sp_std::{fmt::Debug, marker::PhantomData, ops::Deref, vec::Vec};
 
-use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{ensure, sp_runtime::SaturatedConversion, traits::Get, BoundedVec, RuntimeDebug};
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 
 use crate::{Config, Error};
diff --git a/pallets/parachain-staking/Cargo.toml b/pallets/parachain-staking/Cargo.toml
index 1eda33e370..f7a38f53c3 100644
--- a/pallets/parachain-staking/Cargo.toml
+++ b/pallets/parachain-staking/Cargo.toml
@@ -19,7 +19,7 @@ sp-io = {workspace = true, features = ["std"]}
 
 [dependencies]
 # External dependencies
-codec = {package = "parity-scale-codec", workspace = true, features = ["derive"]}
+parity-scale-codec = {workspace = true, features = ["derive"]}
 log.workspace = true
 scale-info = {workspace = true, features = ["derive", "serde"]}
 serde = {workspace = true, optional = true}
@@ -51,7 +51,7 @@ runtime-benchmarks = [
   "sp-staking/runtime-benchmarks",
 ]
 std = [
-  "codec/std",
+  "parity-scale-codec/std",
   "frame-benchmarking?/std",
   "frame-support/std",
   "frame-system/std",
diff --git a/pallets/parachain-staking/src/inflation.rs b/pallets/parachain-staking/src/inflation.rs
index 3e2e9fb5fe..d3ab9913df 100644
--- a/pallets/parachain-staking/src/inflation.rs
+++ b/pallets/parachain-staking/src/inflation.rs
@@ -18,7 +18,7 @@
 
 //! Helper methods for computing issuance based on inflation
 use crate::{pallet::Config, types::BalanceOf};
-use codec::{Decode, Encode, MaxEncodedLen};
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::{traits::Saturating, Perquintill, RuntimeDebug};
 
diff --git a/pallets/parachain-staking/src/lib.rs b/pallets/parachain-staking/src/lib.rs
index 653545b5ec..be2e79b09d 100644
--- a/pallets/parachain-staking/src/lib.rs
+++ b/pallets/parachain-staking/src/lib.rs
@@ -200,7 +200,7 @@ pub mod pallet {
 		/// constrain it to `From<u64>`.
 		/// Note: Definition taken from pallet_gilt
 		type CurrencyBalance: sp_runtime::traits::AtLeast32BitUnsigned
-			+ codec::FullCodec
+			+ parity_scale_codec::FullCodec
 			+ Copy
 			+ MaybeSerializeDeserialize
 			+ sp_std::fmt::Debug
diff --git a/pallets/parachain-staking/src/set.rs b/pallets/parachain-staking/src/set.rs
index 04a9cff9e1..d6d0f496be 100644
--- a/pallets/parachain-staking/src/set.rs
+++ b/pallets/parachain-staking/src/set.rs
@@ -16,8 +16,8 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{traits::Get, BoundedVec, DefaultNoBound, RuntimeDebug};
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::{traits::Zero, SaturatedConversion};
 use sp_std::{
diff --git a/pallets/parachain-staking/src/tests.rs b/pallets/parachain-staking/src/tests.rs
index bfcf96c527..fd1b591447 100644
--- a/pallets/parachain-staking/src/tests.rs
+++ b/pallets/parachain-staking/src/tests.rs
@@ -115,11 +115,11 @@ fn genesis() {
 			assert_eq!(CandidatePool::<Test>::count(), 2);
 
 			// 1
-			assert_eq!(Balances::usable_balance(&1), 500);
-			assert_eq!(Balances::free_balance(&1), 1000);
+			assert_eq!(Balances::usable_balance(1), 500);
+			assert_eq!(Balances::free_balance(1), 1000);
 			assert!(StakePallet::is_active_candidate(&1).is_some());
 			assert_eq!(
-				StakePallet::candidate_pool(&1),
+				StakePallet::candidate_pool(1),
 				Some(
 					Candidate::<AccountId, Balance, <Test as Config>::MaxDelegatorsPerCollator> {
 						id: 1,
@@ -138,11 +138,11 @@ fn genesis() {
 				)
 			);
 			// 2
-			assert_eq!(Balances::usable_balance(&2), 100);
-			assert_eq!(Balances::free_balance(&2), 300);
+			assert_eq!(Balances::usable_balance(2), 100);
+			assert_eq!(Balances::free_balance(2), 300);
 			assert!(StakePallet::is_active_candidate(&2).is_some());
 			assert_eq!(
-				StakePallet::candidate_pool(&2),
+				StakePallet::candidate_pool(2),
 				Some(
 					Candidate::<AccountId, Balance, <Test as Config>::MaxDelegatorsPerCollator> {
 						id: 2,
@@ -170,19 +170,19 @@ fn genesis() {
 			);
 			for x in 3..7 {
 				assert!(StakePallet::is_delegator(&x));
-				assert_eq!(Balances::usable_balance(&x), 0);
-				assert_eq!(Balances::free_balance(&x), 100);
+				assert_eq!(Balances::usable_balance(x), 0);
+				assert_eq!(Balances::free_balance(x), 100);
 			}
 			// Uninvolved
 			for x in 7..10 {
 				assert!(!StakePallet::is_delegator(&x));
 			}
-			assert_eq!(Balances::free_balance(&7), 100);
-			assert_eq!(Balances::usable_balance(&7), 100);
-			assert_eq!(Balances::free_balance(&8), 9);
-			assert_eq!(Balances::usable_balance(&8), 9);
-			assert_eq!(Balances::free_balance(&9), 4);
-			assert_eq!(Balances::usable_balance(&9), 4);
+			assert_eq!(Balances::free_balance(7), 100);
+			assert_eq!(Balances::usable_balance(7), 100);
+			assert_eq!(Balances::free_balance(8), 9);
+			assert_eq!(Balances::usable_balance(8), 9);
+			assert_eq!(Balances::free_balance(9), 4);
+			assert_eq!(Balances::usable_balance(9), 4);
 
 			// Safety first checks
 			assert_eq!(
@@ -235,17 +235,17 @@ fn genesis() {
 			);
 			for x in 1..5 {
 				assert!(StakePallet::is_active_candidate(&x).is_some());
-				assert_eq!(Balances::free_balance(&x), 100);
-				assert_eq!(Balances::usable_balance(&x), 80);
+				assert_eq!(Balances::free_balance(x), 100);
+				assert_eq!(Balances::usable_balance(x), 80);
 			}
 			assert!(StakePallet::is_active_candidate(&5).is_some());
-			assert_eq!(Balances::free_balance(&5), 100);
-			assert_eq!(Balances::usable_balance(&5), 90);
+			assert_eq!(Balances::free_balance(5), 100);
+			assert_eq!(Balances::usable_balance(5), 90);
 			// Delegators
 			for x in 6..11 {
 				assert!(StakePallet::is_delegator(&x));
-				assert_eq!(Balances::free_balance(&x), 100);
-				assert_eq!(Balances::usable_balance(&x), 90);
+				assert_eq!(Balances::free_balance(x), 100);
+				assert_eq!(Balances::usable_balance(x), 90);
 			}
 
 			// Safety first checks
@@ -385,7 +385,7 @@ fn collator_exit_executes_after_delay() {
 			);
 			assert_eq!(StakePallet::selected_candidates().into_inner(), vec![1, 7]);
 			assert_eq!(last_event(), StakeEvent::CollatorScheduledExit(2, 2, 4));
-			let info = StakePallet::candidate_pool(&2).unwrap();
+			let info = StakePallet::candidate_pool(2).unwrap();
 			assert_eq!(info.status, CandidateStatus::Leaving(4));
 
 			roll_to(21, vec![]);
@@ -829,7 +829,7 @@ fn execute_leave_candidates_with_delay() {
 					RuntimeOrigin::signed(collator),
 					collator
 				));
-				assert!(StakePallet::candidate_pool(&collator).is_none());
+				assert!(StakePallet::candidate_pool(collator).is_none());
 				assert!(StakePallet::is_active_candidate(&collator).is_none());
 				assert_eq!(StakePallet::unstaking(collator).len(), 1);
 			}
@@ -980,10 +980,10 @@ fn multiple_delegations() {
 				.contains(&StakeOf::<Test> { owner: 17, amount: 11 }));
 			assert_eq!(StakePallet::delegator_state(8).unwrap().amount, 10);
 			assert_eq!(StakePallet::delegator_state(17).unwrap().amount, 11);
-			assert_eq!(Balances::usable_balance(&8), 90);
-			assert_eq!(Balances::usable_balance(&17), 89);
-			assert_eq!(Balances::free_balance(&8), 100);
-			assert_eq!(Balances::free_balance(&17), 100);
+			assert_eq!(Balances::usable_balance(8), 90);
+			assert_eq!(Balances::usable_balance(17), 89);
+			assert_eq!(Balances::free_balance(8), 100);
+			assert_eq!(Balances::free_balance(17), 100);
 
 			roll_to(35, vec![Some(1), Some(2), Some(3), Some(4)]);
 			assert_ok!(StakePallet::execute_leave_candidates(RuntimeOrigin::signed(2), 2));
@@ -1005,10 +1005,10 @@ fn multiple_delegations() {
 				StakePallet::unlock_unstaked(RuntimeOrigin::signed(12), 12),
 				Error::<Test>::UnstakingIsEmpty
 			);
-			assert_eq!(Balances::usable_balance(&17), 100);
-			assert_eq!(Balances::usable_balance(&8), 100);
-			assert_eq!(Balances::free_balance(&17), 100);
-			assert_eq!(Balances::free_balance(&8), 100);
+			assert_eq!(Balances::usable_balance(17), 100);
+			assert_eq!(Balances::usable_balance(8), 100);
+			assert_eq!(Balances::free_balance(17), 100);
+			assert_eq!(Balances::free_balance(8), 100);
 		});
 }
 
@@ -1288,7 +1288,7 @@ fn delegators_bond() {
 			);
 
 			roll_to(9, vec![]);
-			assert_eq!(Balances::usable_balance(&6), 80);
+			assert_eq!(Balances::usable_balance(6), 80);
 			assert_ok!(StakePallet::init_leave_candidates(RuntimeOrigin::signed(1)));
 			assert!(StakePallet::candidate_pool(1)
 				.unwrap()
@@ -1298,8 +1298,8 @@ fn delegators_bond() {
 			assert!(StakePallet::is_delegator(&6));
 			assert_ok!(StakePallet::execute_leave_candidates(RuntimeOrigin::signed(1), 1));
 			assert!(!StakePallet::is_delegator(&6));
-			assert_eq!(Balances::usable_balance(&6), 80);
-			assert_eq!(Balances::free_balance(&6), 100);
+			assert_eq!(Balances::usable_balance(6), 80);
+			assert_eq!(Balances::free_balance(6), 100);
 		});
 }
 
@@ -1480,59 +1480,59 @@ fn coinbase_rewards_few_blocks_detailed_check() {
 			let authors: Vec<Option<AccountId>> =
 				vec![None, Some(1u64), Some(1u64), Some(1u64), Some(2u64), Some(2u64)];
 			// let d_rewards: Balance = 3 * 2469135802453333 / 2;
-			let user_1 = Balances::usable_balance(&1);
-			let user_2 = Balances::usable_balance(&2);
-			let user_3 = Balances::usable_balance(&3);
-			let user_4 = Balances::usable_balance(&4);
-			let user_5 = Balances::usable_balance(&5);
-
-			assert_eq!(Balances::usable_balance(&1), user_1);
-			assert_eq!(Balances::usable_balance(&2), user_2);
-			assert_eq!(Balances::usable_balance(&3), user_3);
-			assert_eq!(Balances::usable_balance(&4), user_4);
-			assert_eq!(Balances::usable_balance(&5), user_5);
+			let user_1 = Balances::usable_balance(1);
+			let user_2 = Balances::usable_balance(2);
+			let user_3 = Balances::usable_balance(3);
+			let user_4 = Balances::usable_balance(4);
+			let user_5 = Balances::usable_balance(5);
+
+			assert_eq!(Balances::usable_balance(1), user_1);
+			assert_eq!(Balances::usable_balance(2), user_2);
+			assert_eq!(Balances::usable_balance(3), user_3);
+			assert_eq!(Balances::usable_balance(4), user_4);
+			assert_eq!(Balances::usable_balance(5), user_5);
 
 			// 1 is block author for 1st block
 			roll_to_claim_rewards(2, authors.clone());
-			assert_eq!(Balances::usable_balance(&1), user_1 + c_rewards);
-			assert_eq!(Balances::usable_balance(&2), user_2);
-			assert_eq!(Balances::usable_balance(&3), user_3 + d_rewards / 2);
-			assert_eq!(Balances::usable_balance(&4), user_4 + d_rewards / 4);
-			assert_eq!(Balances::usable_balance(&5), user_5);
+			assert_eq!(Balances::usable_balance(1), user_1 + c_rewards);
+			assert_eq!(Balances::usable_balance(2), user_2);
+			assert_eq!(Balances::usable_balance(3), user_3 + d_rewards / 2);
+			assert_eq!(Balances::usable_balance(4), user_4 + d_rewards / 4);
+			assert_eq!(Balances::usable_balance(5), user_5);
 
 			// 1 is block author for 2nd block
 			roll_to_claim_rewards(3, authors.clone());
-			assert_eq!(Balances::usable_balance(&1), user_1 + 2 * c_rewards);
-			assert_eq!(Balances::usable_balance(&2), user_2);
-			assert_eq!(Balances::usable_balance(&3), user_3 + d_rewards);
-			assert_eq!(Balances::usable_balance(&4), user_4 + d_rewards / 2);
-			assert_eq!(Balances::usable_balance(&5), user_5);
+			assert_eq!(Balances::usable_balance(1), user_1 + 2 * c_rewards);
+			assert_eq!(Balances::usable_balance(2), user_2);
+			assert_eq!(Balances::usable_balance(3), user_3 + d_rewards);
+			assert_eq!(Balances::usable_balance(4), user_4 + d_rewards / 2);
+			assert_eq!(Balances::usable_balance(5), user_5);
 
 			// 1 is block author for 3rd block
 			roll_to_claim_rewards(4, authors.clone());
-			assert_eq!(Balances::usable_balance(&1), user_1 + 3 * c_rewards);
-			assert_eq!(Balances::usable_balance(&2), user_2);
-			assert_eq!(Balances::usable_balance(&3), user_3 + d_rewards / 2 * 3);
-			assert_eq!(Balances::usable_balance(&4), user_4 + d_rewards / 4 * 3);
-			assert_eq!(Balances::usable_balance(&5), user_5);
+			assert_eq!(Balances::usable_balance(1), user_1 + 3 * c_rewards);
+			assert_eq!(Balances::usable_balance(2), user_2);
+			assert_eq!(Balances::usable_balance(3), user_3 + d_rewards / 2 * 3);
+			assert_eq!(Balances::usable_balance(4), user_4 + d_rewards / 4 * 3);
+			assert_eq!(Balances::usable_balance(5), user_5);
 
 			// 2 is block author for 4th block
 			roll_to_claim_rewards(5, authors.clone());
-			assert_eq!(Balances::usable_balance(&1), user_1 + 3 * c_rewards);
-			assert_eq!(Balances::usable_balance(&2), user_2 + c_rewards);
-			assert_eq!(Balances::usable_balance(&3), user_3 + d_rewards / 2 * 3);
-			assert_eq!(Balances::usable_balance(&4), user_4 + d_rewards / 4 * 3);
-			assert_eq!(Balances::usable_balance(&5), user_5 + d_rewards / 4);
+			assert_eq!(Balances::usable_balance(1), user_1 + 3 * c_rewards);
+			assert_eq!(Balances::usable_balance(2), user_2 + c_rewards);
+			assert_eq!(Balances::usable_balance(3), user_3 + d_rewards / 2 * 3);
+			assert_eq!(Balances::usable_balance(4), user_4 + d_rewards / 4 * 3);
+			assert_eq!(Balances::usable_balance(5), user_5 + d_rewards / 4);
 			assert_ok!(StakePallet::leave_delegators(RuntimeOrigin::signed(5)));
 
 			// 2 is block author for 5th block
 			roll_to_claim_rewards(6, authors);
-			assert_eq!(Balances::usable_balance(&1), user_1 + 3 * c_rewards);
-			assert_eq!(Balances::usable_balance(&2), user_2 + 2 * c_rewards);
-			assert_eq!(Balances::usable_balance(&3), user_3 + d_rewards / 2 * 3);
-			assert_eq!(Balances::usable_balance(&4), user_4 + d_rewards / 4 * 3);
+			assert_eq!(Balances::usable_balance(1), user_1 + 3 * c_rewards);
+			assert_eq!(Balances::usable_balance(2), user_2 + 2 * c_rewards);
+			assert_eq!(Balances::usable_balance(3), user_3 + d_rewards / 2 * 3);
+			assert_eq!(Balances::usable_balance(4), user_4 + d_rewards / 4 * 3);
 			// should not receive rewards due to revoked delegation
-			assert_eq!(Balances::usable_balance(&5), user_5 + d_rewards / 4);
+			assert_eq!(Balances::usable_balance(5), user_5 + d_rewards / 4);
 		});
 }
 
@@ -1548,12 +1548,12 @@ fn delegator_should_not_receive_rewards_after_revoking() {
 		.execute_with(|| {
 			assert_ok!(StakePallet::leave_delegators(RuntimeOrigin::signed(2)));
 			let authors: Vec<Option<AccountId>> = (1u64..100u64).map(|_| Some(1u64)).collect();
-			assert_eq!(Balances::usable_balance(&1), Balance::zero());
-			assert_eq!(Balances::usable_balance(&2), Balance::zero());
+			assert_eq!(Balances::usable_balance(1), Balance::zero());
+			assert_eq!(Balances::usable_balance(2), Balance::zero());
 			roll_to_claim_rewards(100, authors);
-			assert!(Balances::usable_balance(&1) > Balance::zero());
+			assert!(Balances::usable_balance(1) > Balance::zero());
 			assert_ok!(StakePallet::unlock_unstaked(RuntimeOrigin::signed(2), 2));
-			assert_eq!(Balances::usable_balance(&2), 10_000_000 * DECIMALS);
+			assert_eq!(Balances::usable_balance(2), 10_000_000 * DECIMALS);
 		});
 
 	ExtBuilder::default()
@@ -1569,14 +1569,14 @@ fn delegator_should_not_receive_rewards_after_revoking() {
 		.execute_with(|| {
 			assert_ok!(StakePallet::leave_delegators(RuntimeOrigin::signed(3)));
 			let authors: Vec<Option<AccountId>> = (1u64..100u64).map(|_| Some(1u64)).collect();
-			assert_eq!(Balances::usable_balance(&1), Balance::zero());
-			assert_eq!(Balances::usable_balance(&2), Balance::zero());
-			assert_eq!(Balances::usable_balance(&3), Balance::zero());
+			assert_eq!(Balances::usable_balance(1), Balance::zero());
+			assert_eq!(Balances::usable_balance(2), Balance::zero());
+			assert_eq!(Balances::usable_balance(3), Balance::zero());
 			roll_to_claim_rewards(100, authors);
-			assert!(Balances::usable_balance(&1) > Balance::zero());
-			assert!(Balances::usable_balance(&2) > Balance::zero());
+			assert!(Balances::usable_balance(1) > Balance::zero());
+			assert!(Balances::usable_balance(2) > Balance::zero());
 			assert_ok!(StakePallet::unlock_unstaked(RuntimeOrigin::signed(3), 3));
-			assert_eq!(Balances::usable_balance(&3), 10_000_000 * DECIMALS);
+			assert_eq!(Balances::usable_balance(3), 10_000_000 * DECIMALS);
 		});
 }
 #[test]
@@ -1607,11 +1607,11 @@ fn coinbase_rewards_many_blocks_simple_check() {
 			let authors: Vec<Option<AccountId>> = (0u64..=end_block).map(|i| Some(i % 2 + 1)).collect();
 			roll_to_claim_rewards(end_block, authors);
 
-			let rewards_1 = Balances::free_balance(&1).saturating_sub(40_000_000 * DECIMALS);
-			let rewards_2 = Balances::free_balance(&2).saturating_sub(40_000_000 * DECIMALS);
-			let rewards_3 = Balances::free_balance(&3).saturating_sub(40_000_000 * DECIMALS);
-			let rewards_4 = Balances::free_balance(&4).saturating_sub(20_000_000 * DECIMALS);
-			let rewards_5 = Balances::free_balance(&5).saturating_sub(20_000_000 * DECIMALS);
+			let rewards_1 = Balances::free_balance(1).saturating_sub(40_000_000 * DECIMALS);
+			let rewards_2 = Balances::free_balance(2).saturating_sub(40_000_000 * DECIMALS);
+			let rewards_3 = Balances::free_balance(3).saturating_sub(40_000_000 * DECIMALS);
+			let rewards_4 = Balances::free_balance(4).saturating_sub(20_000_000 * DECIMALS);
+			let rewards_5 = Balances::free_balance(5).saturating_sub(20_000_000 * DECIMALS);
 			let expected_collator_rewards =
 				num_of_years * inflation.collator.reward_rate.annual * 16_000_000 * DECIMALS;
 			let expected_delegator_rewards =
@@ -1694,7 +1694,7 @@ fn should_not_reward_delegators_below_min_stake() {
 		.build()
 		.execute_with(|| {
 			// impossible but lets assume it happened
-			let mut state = StakePallet::candidate_pool(&1).expect("CollatorState cannot be missing");
+			let mut state = StakePallet::candidate_pool(1).expect("CollatorState cannot be missing");
 			let delegator_stake_below_min = <Test as Config>::MinDelegatorStake::get() - 1;
 			state.stake += delegator_stake_below_min;
 			state.total += delegator_stake_below_min;
@@ -1706,17 +1706,17 @@ fn should_not_reward_delegators_below_min_stake() {
 			<crate::CandidatePool<Test>>::insert(1u64, state);
 
 			let authors: Vec<Option<AccountId>> = vec![Some(1u64), Some(1u64), Some(1u64), Some(1u64)];
-			assert_eq!(Balances::usable_balance(&1), Balance::zero());
-			assert_eq!(Balances::usable_balance(&2), Balance::zero());
-			assert_eq!(Balances::usable_balance(&3), Balance::zero());
-			assert_eq!(Balances::usable_balance(&4), 5);
+			assert_eq!(Balances::usable_balance(1), Balance::zero());
+			assert_eq!(Balances::usable_balance(2), Balance::zero());
+			assert_eq!(Balances::usable_balance(3), Balance::zero());
+			assert_eq!(Balances::usable_balance(4), 5);
 
 			// should only reward 1
 			roll_to_claim_rewards(4, authors);
-			assert!(Balances::usable_balance(&1) > Balance::zero());
-			assert_eq!(Balances::usable_balance(&4), 5);
-			assert_eq!(Balances::usable_balance(&2), Balance::zero());
-			assert_eq!(Balances::usable_balance(&3), Balance::zero());
+			assert!(Balances::usable_balance(1) > Balance::zero());
+			assert_eq!(Balances::usable_balance(4), 5);
+			assert_eq!(Balances::usable_balance(2), Balance::zero());
+			assert_eq!(Balances::usable_balance(3), Balance::zero());
 		});
 }
 
@@ -2678,8 +2678,8 @@ fn adjust_reward_rates() {
 
 			// reward once in first year
 			roll_to_claim_rewards(2, authors.clone());
-			let c_rewards_0 = Balances::free_balance(&1).saturating_sub(10_000_000 * DECIMALS);
-			let d_rewards_0 = Balances::free_balance(&2).saturating_sub(90_000_000 * DECIMALS);
+			let c_rewards_0 = Balances::free_balance(1).saturating_sub(10_000_000 * DECIMALS);
+			let d_rewards_0 = Balances::free_balance(2).saturating_sub(90_000_000 * DECIMALS);
 			assert!(!c_rewards_0.is_zero());
 			assert!(!d_rewards_0.is_zero());
 
@@ -2700,10 +2700,10 @@ fn adjust_reward_rates() {
 			assert_eq!(StakePallet::inflation_config(), inflation_1);
 			// reward once in 2nd year
 			roll_to_claim_rewards(<Test as Config>::BLOCKS_PER_YEAR + 2, authors.clone());
-			let c_rewards_1 = Balances::free_balance(&1)
+			let c_rewards_1 = Balances::free_balance(1)
 				.saturating_sub(10_000_000 * DECIMALS)
 				.saturating_sub(c_rewards_0);
-			let d_rewards_1 = Balances::free_balance(&2)
+			let d_rewards_1 = Balances::free_balance(2)
 				.saturating_sub(90_000_000 * DECIMALS)
 				.saturating_sub(d_rewards_0);
 			assert!(
@@ -2731,13 +2731,13 @@ fn adjust_reward_rates() {
 			assert_eq!(StakePallet::inflation_config(), inflation_2);
 			// reward once in 3rd year
 			roll_to_claim_rewards(2 * <Test as Config>::BLOCKS_PER_YEAR + 2, authors);
-			let c_rewards_2 = Balances::free_balance(&1)
+			let c_rewards_2 = Balances::free_balance(1)
 				.saturating_sub(10_000_000 * DECIMALS)
 				.saturating_sub(c_rewards_0)
 				.saturating_sub(c_rewards_1);
 			assert!(c_rewards_1 > c_rewards_2);
 			// should be zero because we set reward rate to zero
-			let d_rewards_2 = Balances::free_balance(&2)
+			let d_rewards_2 = Balances::free_balance(2)
 				.saturating_sub(90_000_000 * DECIMALS)
 				.saturating_sub(d_rewards_0)
 				.saturating_sub(d_rewards_1);
@@ -3418,13 +3418,13 @@ fn network_reward_multiple_blocks() {
 			assert_eq!(max_stake, StakePallet::max_candidate_stake());
 			let total_collator_stake = max_stake.saturating_mul(<Test as Config>::MinCollators::get().into());
 			assert_eq!(total_collator_stake, StakePallet::total_collator_stake().collators);
-			assert!(Balances::free_balance(&TREASURY_ACC).is_zero());
+			assert!(Balances::free_balance(TREASURY_ACC).is_zero());
 			let total_issuance = <Test as Config>::Currency::total_issuance();
 
 			// total issuance should not increase when not noting authors because we haven't
 			// reached NetworkRewardStart yet
 			roll_to(10, vec![None]);
-			assert!(Balances::free_balance(&TREASURY_ACC).is_zero());
+			assert!(Balances::free_balance(TREASURY_ACC).is_zero());
 			assert_eq!(total_issuance, <Test as Config>::Currency::total_issuance());
 
 			// set current block to one block before NetworkRewardStart
@@ -3433,12 +3433,12 @@ fn network_reward_multiple_blocks() {
 
 			// network rewards should only appear 1 block after start
 			roll_to(network_reward_start, vec![None]);
-			assert!(Balances::free_balance(&TREASURY_ACC).is_zero());
+			assert!(Balances::free_balance(TREASURY_ACC).is_zero());
 			assert_eq!(total_issuance, <Test as Config>::Currency::total_issuance());
 
 			// should mint to treasury now
 			roll_to(network_reward_start + 1, vec![None]);
-			let network_reward = Balances::free_balance(&TREASURY_ACC);
+			let network_reward = Balances::free_balance(TREASURY_ACC);
 			assert!(!network_reward.is_zero());
 			assert_eq!(
 				total_issuance + network_reward,
@@ -3450,7 +3450,7 @@ fn network_reward_multiple_blocks() {
 
 			// should mint exactly the same amount
 			roll_to(network_reward_start + 2, vec![None]);
-			assert_eq!(2 * network_reward, Balances::free_balance(&TREASURY_ACC));
+			assert_eq!(2 * network_reward, Balances::free_balance(TREASURY_ACC));
 			assert_eq!(
 				total_issuance + 2 * network_reward,
 				<Test as Config>::Currency::total_issuance()
@@ -3458,7 +3458,7 @@ fn network_reward_multiple_blocks() {
 
 			// should mint exactly the same amount in each block
 			roll_to(network_reward_start + 100, vec![None]);
-			assert_eq!(100 * network_reward, Balances::free_balance(&TREASURY_ACC));
+			assert_eq!(100 * network_reward, Balances::free_balance(TREASURY_ACC));
 			assert_eq!(
 				total_issuance + 100 * network_reward,
 				<Test as Config>::Currency::total_issuance()
@@ -3468,7 +3468,7 @@ fn network_reward_multiple_blocks() {
 			// based on MaxCollatorCandidateStake and MaxSelectedCandidates
 			assert_ok!(StakePallet::init_leave_candidates(RuntimeOrigin::signed(1)));
 			roll_to(network_reward_start + 101, vec![None]);
-			assert_eq!(101 * network_reward, Balances::free_balance(&TREASURY_ACC));
+			assert_eq!(101 * network_reward, Balances::free_balance(TREASURY_ACC));
 			assert_eq!(
 				total_issuance + 101 * network_reward,
 				<Test as Config>::Currency::total_issuance()
@@ -3494,7 +3494,7 @@ fn network_reward_increase_max_candidate_stake() {
 
 			// should mint to treasury now
 			roll_to(network_reward_start + 1, vec![None]);
-			let reward_before = Balances::free_balance(&TREASURY_ACC);
+			let reward_before = Balances::free_balance(TREASURY_ACC);
 			assert!(!reward_before.is_zero());
 			assert_eq!(
 				total_issuance + reward_before,
@@ -3509,7 +3509,7 @@ fn network_reward_increase_max_candidate_stake() {
 				max_stake_doubled
 			));
 			roll_to(network_reward_start + 2, vec![None]);
-			assert_eq!(reward_before + reward_after, Balances::free_balance(&TREASURY_ACC));
+			assert_eq!(reward_before + reward_after, Balances::free_balance(TREASURY_ACC));
 			assert_eq!(
 				reward_before + reward_after + total_issuance,
 				<Test as Config>::Currency::total_issuance()
@@ -3535,7 +3535,7 @@ fn network_reward_increase_max_collator_count() {
 
 			// should mint to treasury now
 			roll_to(network_reward_start + 1, vec![None]);
-			let reward_before = Balances::free_balance(&TREASURY_ACC);
+			let reward_before = Balances::free_balance(TREASURY_ACC);
 			assert!(!reward_before.is_zero());
 			assert_eq!(
 				total_issuance + reward_before,
@@ -3549,7 +3549,7 @@ fn network_reward_increase_max_collator_count() {
 				<Test as Config>::MinCollators::get() * 3
 			));
 			roll_to(network_reward_start + 2, vec![None]);
-			assert_eq!(reward_before + reward_after, Balances::free_balance(&TREASURY_ACC));
+			assert_eq!(reward_before + reward_after, Balances::free_balance(TREASURY_ACC));
 			assert_eq!(
 				reward_before + reward_after + total_issuance,
 				<Test as Config>::Currency::total_issuance()
@@ -4237,9 +4237,9 @@ fn rewards_incrementing_and_claiming() {
 			assert_ok!(StakePallet::claim_rewards(RuntimeOrigin::signed(1)));
 			assert!(StakePallet::rewards(1).is_zero());
 			// delegator situation should be unchanged
-			assert!(Balances::free_balance(&1) > DECIMALS);
-			assert_eq!(Balances::free_balance(&2), DECIMALS);
-			assert_eq!(Balances::free_balance(&3), DECIMALS);
+			assert!(Balances::free_balance(1) > DECIMALS);
+			assert_eq!(Balances::free_balance(2), DECIMALS);
+			assert_eq!(Balances::free_balance(3), DECIMALS);
 
 			// incrementing again should not change anything because collator has not
 			// authored blocks since last inc
@@ -4247,9 +4247,9 @@ fn rewards_incrementing_and_claiming() {
 			assert_eq!(StakePallet::blocks_rewarded(2), 1);
 			// claim for 2 to move rewards into balance
 			assert_ok!(StakePallet::claim_rewards(RuntimeOrigin::signed(2)));
-			assert!(Balances::free_balance(&2) > DECIMALS);
+			assert!(Balances::free_balance(2) > DECIMALS);
 			assert!(StakePallet::rewards(2).is_zero());
-			assert_eq!(Balances::free_balance(&3), DECIMALS);
+			assert_eq!(Balances::free_balance(3), DECIMALS);
 
 			// should not be able to claim for incorrect role
 			assert_noop!(
@@ -4298,17 +4298,17 @@ fn api_get_unclaimed_staking_rewards() {
 			// API and actual claiming should match
 			assert_ok!(StakePallet::increment_collator_rewards(RuntimeOrigin::signed(1)));
 			assert_ok!(StakePallet::claim_rewards(RuntimeOrigin::signed(1)));
-			assert_eq!(rewards_1, Balances::usable_balance(&1));
+			assert_eq!(rewards_1, Balances::usable_balance(1));
 			assert!(StakePallet::get_unclaimed_staking_rewards(&1).is_zero());
 
 			assert_ok!(StakePallet::increment_delegator_rewards(RuntimeOrigin::signed(2)));
 			assert_ok!(StakePallet::claim_rewards(RuntimeOrigin::signed(2)));
-			assert_eq!(rewards_2, Balances::usable_balance(&2));
+			assert_eq!(rewards_2, Balances::usable_balance(2));
 			assert!(StakePallet::get_unclaimed_staking_rewards(&2).is_zero());
 
 			assert_ok!(StakePallet::increment_collator_rewards(RuntimeOrigin::signed(3)));
 			assert_ok!(StakePallet::claim_rewards(RuntimeOrigin::signed(3)));
-			assert_eq!(rewards_3 + 98 * stake, Balances::usable_balance(&3));
+			assert_eq!(rewards_3 + 98 * stake, Balances::usable_balance(3));
 			assert!(StakePallet::get_unclaimed_staking_rewards(&3).is_zero());
 		});
 }
diff --git a/pallets/parachain-staking/src/types.rs b/pallets/parachain-staking/src/types.rs
index eff97ae17d..2d3f7899cf 100644
--- a/pallets/parachain-staking/src/types.rs
+++ b/pallets/parachain-staking/src/types.rs
@@ -16,8 +16,8 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::traits::{Currency, Get};
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{AtLeast32BitUnsigned, CheckedSub, Saturating, Zero},
@@ -87,20 +87,15 @@ impl<AccountId: Ord, Balance: PartialEq + Ord> Ord for Stake<AccountId, Balance>
 }
 
 /// The activity status of the collator.
-#[derive(Copy, Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug, TypeInfo, MaxEncodedLen)]
+#[derive(Copy, Clone, Default, PartialEq, Eq, Encode, Decode, RuntimeDebug, TypeInfo, MaxEncodedLen)]
 pub enum CandidateStatus {
 	/// Committed to be online and producing valid blocks (not equivocating)
+	#[default]
 	Active,
 	/// Staked until the inner round
 	Leaving(SessionIndex),
 }
 
-impl Default for CandidateStatus {
-	fn default() -> CandidateStatus {
-		CandidateStatus::Active
-	}
-}
-
 #[derive(Encode, Decode, Clone, RuntimeDebug, PartialEq, Eq, TypeInfo, MaxEncodedLen)]
 #[scale_info(skip_type_params(MaxDelegatorsPerCandidate))]
 #[codec(mel_bound(AccountId: MaxEncodedLen, Balance: MaxEncodedLen))]
diff --git a/pallets/public-credentials/Cargo.toml b/pallets/public-credentials/Cargo.toml
index 7a8feb8291..2a3791f953 100644
--- a/pallets/public-credentials/Cargo.toml
+++ b/pallets/public-credentials/Cargo.toml
@@ -20,7 +20,7 @@ sp-keystore = {workspace = true, features = ["std"]}
 
 [dependencies]
 # External dependencies
-codec = {package = "parity-scale-codec", workspace = true, features = ["derive"]}
+parity-scale-codec = {workspace = true, features = ["derive"]}
 scale-info = {workspace = true, features = ["derive"]}
 
 # Internal dependencies
@@ -47,7 +47,7 @@ runtime-benchmarks = [
   "sp-runtime/runtime-benchmarks",
 ]
 std = [
-  "codec/std",
+  "parity-scale-codec/std",
   "scale-info/std",
   "ctype/std",
   "kilt-support/std",
diff --git a/pallets/public-credentials/src/credentials.rs b/pallets/public-credentials/src/credentials.rs
index 4b7a204ecd..21c8698b59 100644
--- a/pallets/public-credentials/src/credentials.rs
+++ b/pallets/public-credentials/src/credentials.rs
@@ -16,7 +16,7 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::{Decode, Encode, MaxEncodedLen};
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 
 use frame_support::RuntimeDebug;
diff --git a/pallets/public-credentials/src/mock.rs b/pallets/public-credentials/src/mock.rs
index b7d69f3d7a..b3bfa4f0b8 100644
--- a/pallets/public-credentials/src/mock.rs
+++ b/pallets/public-credentials/src/mock.rs
@@ -16,8 +16,8 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::Encode;
 use frame_support::traits::Get;
+use parity_scale_codec::Encode;
 use sp_runtime::traits::Hash;
 
 use kilt_support::deposit::Deposit;
@@ -94,13 +94,13 @@ pub use crate::mock::runtime::*;
 pub(crate) mod runtime {
 	use super::*;
 
-	use codec::{Decode, Encode, MaxEncodedLen};
 	use frame_support::{
 		dispatch::Weight,
 		traits::{ConstU128, ConstU16, ConstU32, ConstU64},
 		weights::constants::RocksDbWeight,
 	};
 	use frame_system::EnsureSigned;
+	use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 	use scale_info::TypeInfo;
 	use sp_core::{sr25519, Pair};
 	use sp_runtime::{
diff --git a/runtime-api/did/Cargo.toml b/runtime-api/did/Cargo.toml
index 51a5972ebc..978bbdd040 100644
--- a/runtime-api/did/Cargo.toml
+++ b/runtime-api/did/Cargo.toml
@@ -12,7 +12,7 @@ description = "Runtime APIs for dealing with DIDs."
 
 [dependencies]
 # External dependencies
-codec = {package = "parity-scale-codec", workspace = true, default-features = false, features = ["derive"]}
+parity-scale-codec = {workspace = true, features = ["derive"]}
 scale-info = {workspace = true, default-features = false, features = ["derive"]}
 
 # Internal dependencies
@@ -26,7 +26,7 @@ sp-std.workspace = true
 [features]
 default = ["std"]
 std = [
-  "codec/std",
+  "parity-scale-codec/std",
   "sp-api/std",
   "sp-std/std",
   "scale-info/std",
diff --git a/runtime-api/did/src/did_details.rs b/runtime-api/did/src/did_details.rs
index 06ac8c089f..509aa72928 100644
--- a/runtime-api/did/src/did_details.rs
+++ b/runtime-api/did/src/did_details.rs
@@ -16,7 +16,7 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::{Decode, Encode, MaxEncodedLen};
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_std::collections::{btree_map::BTreeMap, btree_set::BTreeSet};
 
diff --git a/runtime-api/did/src/lib.rs b/runtime-api/did/src/lib.rs
index 0231d618cd..291e779601 100644
--- a/runtime-api/did/src/lib.rs
+++ b/runtime-api/did/src/lib.rs
@@ -18,7 +18,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::{Codec, Decode, Encode, MaxEncodedLen};
+use parity_scale_codec::{Codec, Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_std::vec::Vec;
 
diff --git a/runtime-api/did/src/service_endpoint.rs b/runtime-api/did/src/service_endpoint.rs
index fb0f15304e..8b620c5ed2 100644
--- a/runtime-api/did/src/service_endpoint.rs
+++ b/runtime-api/did/src/service_endpoint.rs
@@ -16,7 +16,7 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode};
 use scale_info::TypeInfo;
 use sp_std::vec::Vec;
 
diff --git a/runtime-api/public-credentials/Cargo.toml b/runtime-api/public-credentials/Cargo.toml
index 4d983407b0..c67603984e 100644
--- a/runtime-api/public-credentials/Cargo.toml
+++ b/runtime-api/public-credentials/Cargo.toml
@@ -12,7 +12,7 @@ description = "Runtime APIs for dealing with public credentials."
 
 [dependencies]
 # External dependencies
-codec = {package = "parity-scale-codec",  workspace = true}
+parity-scale-codec = {workspace = true, features = ["derive"]}
 
 # Internal dependencies
 kilt-support.workspace = true
@@ -24,7 +24,7 @@ sp-std.workspace = true
 [features]
 default = ["std"]
 std = [
-	"codec/std",
+	"parity-scale-codec/std",
   "kilt-support/std",
 	"sp-api/std",
 	"sp-std/std",
diff --git a/runtime-api/public-credentials/src/lib.rs b/runtime-api/public-credentials/src/lib.rs
index 48c52d4cc5..b4638f51b7 100644
--- a/runtime-api/public-credentials/src/lib.rs
+++ b/runtime-api/public-credentials/src/lib.rs
@@ -18,7 +18,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::Codec;
+use parity_scale_codec::Codec;
 use sp_std::vec::Vec;
 
 use kilt_support::traits::ItemFilter;
diff --git a/runtime-api/staking/Cargo.toml b/runtime-api/staking/Cargo.toml
index aad32cd56c..d947758865 100644
--- a/runtime-api/staking/Cargo.toml
+++ b/runtime-api/staking/Cargo.toml
@@ -12,7 +12,7 @@ description = "Runtime APIs for dealing with parachain staking."
 
 [dependencies]
 # External dependencies
-codec = {package = "parity-scale-codec", workspace = true, features = ["derive"]}
+parity-scale-codec = {workspace = true, features = ["derive"]}
 scale-info = {workspace = true, features = ["derive"]}
 
 # Substrate dependencies
@@ -22,7 +22,7 @@ sp-runtime.workspace = true
 [features]
 default = ["std"]
 std = [
-  "codec/std",
+  "parity-scale-codec/std",
   "sp-api/std",
   "sp-runtime/std",
   "scale-info/std",
diff --git a/runtime-api/staking/src/lib.rs b/runtime-api/staking/src/lib.rs
index e2ff51596f..197ee3502e 100644
--- a/runtime-api/staking/src/lib.rs
+++ b/runtime-api/staking/src/lib.rs
@@ -18,7 +18,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::{Codec, Decode, Encode, MaxEncodedLen};
+use parity_scale_codec::{Codec, Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::Perquintill;
 
diff --git a/runtimes/common/Cargo.toml b/runtimes/common/Cargo.toml
index 97b5fc6f33..8ae80c73f0 100644
--- a/runtimes/common/Cargo.toml
+++ b/runtimes/common/Cargo.toml
@@ -15,7 +15,7 @@ sp-io = {workspace = true, features = ["std"]}
 
 [dependencies]
 # External dependencies
-codec = {package = "parity-scale-codec", workspace = true, features = ["derive"]}
+parity-scale-codec = {workspace = true, features = ["derive"]}
 log.workspace = true
 kilt-asset-dids.workspace = true
 scale-info = {workspace = true, features = ["derive"]}
@@ -75,7 +75,7 @@ runtime-benchmarks = [
 ]
 std = [
   "attestation/std",
-  "codec/std",
+  "parity-scale-codec/std",
   "ctype/std",
   "cumulus-primitives-core/std",
   "frame-support/std",
diff --git a/runtimes/common/src/assets.rs b/runtimes/common/src/assets.rs
index 87c04f049a..b0754e044d 100644
--- a/runtimes/common/src/assets.rs
+++ b/runtimes/common/src/assets.rs
@@ -16,7 +16,7 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::{Decode, Encode, MaxEncodedLen};
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::RuntimeDebug;
 use sp_std::vec::Vec;
@@ -91,7 +91,7 @@ impl ItemFilter<CredentialEntry<Hash, AccountId, BlockNumber, AccountId, Balance
 mod benchmarks {
 	use super::*;
 
-	use codec::alloc::string::ToString;
+	use parity_scale_codec::alloc::string::ToString;
 	use sp_std::vec::Vec;
 
 	use kilt_asset_dids::{asset, chain};
@@ -112,17 +112,17 @@ mod benchmarks {
 				[
 					b"did:asset:",
 					// Chain part
-					&[b'0'; chain::MAXIMUM_NAMESPACE_LENGTH][..],
+					&[b'0'; chain::MAXIMUM_CHAIN_NAMESPACE_LENGTH][..],
 					b":",
-					&[b'1'; chain::MAXIMUM_REFERENCE_LENGTH][..],
+					&[b'1'; chain::MAXIMUM_CHAIN_REFERENCE_LENGTH][..],
 					// "." separator
 					b".",
 					// Asset part
 					&[b'2'; asset::MAXIMUM_NAMESPACE_LENGTH][..],
 					b":",
-					&[b'3'; asset::MAXIMUM_REFERENCE_LENGTH][..],
+					&[b'3'; asset::MAXIMUM_ASSET_REFERENCE_LENGTH][..],
 					b":",
-					&[b'4'; asset::MAXIMUM_IDENTIFIER_LENGTH][..],
+					&[b'4'; asset::MAXIMUM_ASSET_IDENTIFIER_LENGTH][..],
 				]
 				.concat(),
 			)
diff --git a/runtimes/common/src/authorization.rs b/runtimes/common/src/authorization.rs
index 2ea1b101c3..a728fc45aa 100644
--- a/runtimes/common/src/authorization.rs
+++ b/runtimes/common/src/authorization.rs
@@ -15,8 +15,8 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
-use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::dispatch::Weight;
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::DispatchError;
 
diff --git a/runtimes/common/src/benchmarks.rs b/runtimes/common/src/benchmarks.rs
index 15ebffa318..d029eb612e 100644
--- a/runtimes/common/src/benchmarks.rs
+++ b/runtimes/common/src/benchmarks.rs
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
-use codec::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode};
 use scale_info::TypeInfo;
 use sp_std::vec::Vec;
 
diff --git a/runtimes/common/src/errors.rs b/runtimes/common/src/errors.rs
index 7559a307c9..4a57eab368 100644
--- a/runtimes/common/src/errors.rs
+++ b/runtimes/common/src/errors.rs
@@ -16,7 +16,7 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode};
 use scale_info::TypeInfo;
 
 #[derive(Encode, Decode, TypeInfo)]
diff --git a/runtimes/common/src/migrations.rs b/runtimes/common/src/migrations.rs
index 413e3e8227..a8e1b927e7 100644
--- a/runtimes/common/src/migrations.rs
+++ b/runtimes/common/src/migrations.rs
@@ -16,276 +16,53 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use frame_support::traits::{GetStorageVersion, OnRuntimeUpgrade};
-use sp_runtime::traits::{Get, Zero};
+use frame_support::{
+	storage::unhashed::clear_prefix, traits::OnRuntimeUpgrade, weights::Weight, StorageHasher, Twox128,
+};
+use sp_core::Get;
+use sp_io::MultiRemovalResults;
 use sp_std::marker::PhantomData;
 
-use ctype::{CtypeCreatorOf, CtypeEntryOf};
+const PALLET_RUNTIME_NAME: &[u8] = b"RandomnessCollectiveFlip";
+const PALLET_STORAGE_NAME: &[u8] = b"RandomMaterial";
 
-#[cfg(feature = "try-runtime")]
-use sp_std::vec::Vec;
+pub struct RemoveInsecureRandomnessPallet<T>(PhantomData<T>);
 
-pub struct AddCTypeBlockNumber<R>(PhantomData<R>);
-
-impl<T: ctype::Config> OnRuntimeUpgrade for AddCTypeBlockNumber<T> {
-	#[cfg(feature = "try-runtime")]
-	fn pre_upgrade() -> Result<Vec<u8>, &'static str> {
-		// Missed the migration when v1 was introduced, so now Spiritnet and Peregrine
-		// are on v0 although they should be on v1.
-		assert!(ctype::Pallet::<T>::on_chain_storage_version() <= 1,);
-
-		// Use iter_keys() on new storage so it won't try to decode values.
-		let ctypes_to_migrate = ctype::Ctypes::<T>::iter_keys().count() as u64;
-
-		log::info!("🪪  CType pallet pre check: {:?} CTypes to migrate", ctypes_to_migrate);
-		Ok(ctypes_to_migrate.to_be_bytes().into())
-	}
-
-	fn on_runtime_upgrade() -> frame_support::weights::Weight {
-		let current = ctype::Pallet::<T>::current_storage_version();
-		let onchain = ctype::Pallet::<T>::on_chain_storage_version();
-
-		log::info!(
-			"💰 Running CType migration with current storage version {:?} / onchain {:?}",
-			current,
-			onchain
-		);
-
-		let mut num_translations = 0u64;
-		let default_block_number = <T as frame_system::Config>::BlockNumber::zero();
-
-		ctype::Ctypes::<T>::translate_values(|old: CtypeCreatorOf<T>| {
-			num_translations = num_translations.saturating_add(1);
-			Some(CtypeEntryOf::<T> {
-				creator: old,
-				created_at: default_block_number,
-			})
-		});
-		current.put::<ctype::Pallet<T>>();
-
-		// Num translations + old version read and new version write
-		T::DbWeight::get().reads_writes(num_translations.saturating_add(1), num_translations.saturating_add(1))
-	}
-
-	#[cfg(feature = "try-runtime")]
-	fn post_upgrade(state: Vec<u8>) -> Result<(), &'static str> {
-		assert_eq!(ctype::Pallet::<T>::on_chain_storage_version(), 2);
-
-		let initial_ctype_count = u64::from_be_bytes(state.try_into().expect("input state should be 8 bytes"));
-		assert_eq!(initial_ctype_count, ctype::Ctypes::<T>::iter().count() as u64);
-		// Verify all migrated ctypes can be decoded under the new type.
-		ctype::Ctypes::<T>::iter_values().for_each(|v| assert!(v.created_at.is_zero()));
-
-		log::info!(
-			"🪪  CType pallet post checks ok, all {:} CTypes have been migrated ✅",
-			initial_ctype_count
-		);
-		Ok(())
-	}
-}
-
-pub struct MigrateToNewStorageVersion<R>(PhantomData<R>);
-
-impl<R> MigrateToNewStorageVersion<R>
-where
-	R: attestation::Config + pallet_web3_names::Config + public_credentials::Config,
-{
-	fn migrate() -> frame_support::weights::Weight {
-		type AttestationPallet<R> = attestation::Pallet<R>;
-		type Web3NamesPallet<R> = pallet_web3_names::Pallet<R>;
-		type PublicCredentialsPallet<R> = public_credentials::Pallet<R>;
-
-		AttestationPallet::<R>::current_storage_version().put::<AttestationPallet<R>>();
-		// Not an issue with Peregrine, but it is with Spiritnet.
-		Web3NamesPallet::<R>::current_storage_version().put::<Web3NamesPallet<R>>();
-		PublicCredentialsPallet::<R>::current_storage_version().put::<PublicCredentialsPallet<R>>();
-
-		<R as frame_system::Config>::DbWeight::get().writes(3)
-	}
-}
-
-#[cfg(feature = "try-runtime")]
-impl<R> OnRuntimeUpgrade for MigrateToNewStorageVersion<R>
+impl<T> OnRuntimeUpgrade for RemoveInsecureRandomnessPallet<T>
 where
-	R: attestation::Config
-		+ ctype::Config
-		+ delegation::Config
-		+ did::Config
-		+ pallet_did_lookup::Config
-		+ pallet_inflation::Config
-		+ pallet_web3_names::Config
-		+ parachain_staking::Config
-		+ public_credentials::Config,
+	T: frame_system::Config,
 {
-	fn pre_upgrade() -> Result<Vec<u8>, &'static str> {
-		type AttestationPallet<R> = attestation::Pallet<R>;
-		type DelegationPallet<R> = delegation::Pallet<R>;
-		type DidPallet<R> = did::Pallet<R>;
-		type LookupPallet<R> = pallet_did_lookup::Pallet<R>;
-		type InflationPallet<R> = pallet_inflation::Pallet<R>;
-		type Web3NamesPallet<R> = pallet_web3_names::Pallet<R>;
-		type ParachainStakingPallet<R> = parachain_staking::Pallet<R>;
-		type PublicCredentialsPallet<R> = public_credentials::Pallet<R>;
-
-		log::info!("💿  Storage version pre checks");
-
-		if AttestationPallet::<R>::on_chain_storage_version() != AttestationPallet::<R>::current_storage_version() {
-			log::warn!(
-				"🚨 Attestation pallet on chain version {:?} != declared storage version {:?}.",
-				AttestationPallet::<R>::on_chain_storage_version(),
-				AttestationPallet::<R>::current_storage_version()
-			)
-		}
-		if DelegationPallet::<R>::on_chain_storage_version() != DelegationPallet::<R>::current_storage_version() {
-			log::warn!(
-				"🚨 Delegation pallet on chain version {:?} != declared storage version {:?}.",
-				DelegationPallet::<R>::on_chain_storage_version(),
-				DelegationPallet::<R>::current_storage_version()
-			)
-		}
-		if DidPallet::<R>::on_chain_storage_version() != DidPallet::<R>::current_storage_version() {
-			log::warn!(
-				"🚨 Did pallet on chain version {:?} != declared storage version {:?}.",
-				DidPallet::<R>::on_chain_storage_version(),
-				DidPallet::<R>::current_storage_version()
-			)
-		}
-		if LookupPallet::<R>::on_chain_storage_version() != LookupPallet::<R>::current_storage_version() {
-			log::warn!(
-				"🚨 Lookup pallet on chain version {:?} != declared storage version {:?}.",
-				LookupPallet::<R>::on_chain_storage_version(),
-				LookupPallet::<R>::current_storage_version()
-			)
-		}
-		if InflationPallet::<R>::on_chain_storage_version() != InflationPallet::<R>::current_storage_version() {
-			log::warn!(
-				"🚨 Inflation pallet on chain version {:?} != declared storage version {:?}.",
-				InflationPallet::<R>::on_chain_storage_version(),
-				InflationPallet::<R>::current_storage_version()
-			)
-		}
-		if Web3NamesPallet::<R>::on_chain_storage_version() != Web3NamesPallet::<R>::current_storage_version() {
-			log::warn!(
-				"🚨 Web3names pallet on chain version {:?} != declared storage version {:?}.",
-				Web3NamesPallet::<R>::on_chain_storage_version(),
-				Web3NamesPallet::<R>::current_storage_version()
-			)
-		}
-		if ParachainStakingPallet::<R>::on_chain_storage_version()
-			!= ParachainStakingPallet::<R>::current_storage_version()
-		{
-			log::warn!(
-				"🚨 Parachain staking pallet on chain version {:?} != declared storage version {:?}.",
-				ParachainStakingPallet::<R>::on_chain_storage_version(),
-				ParachainStakingPallet::<R>::current_storage_version()
-			)
-		}
-		if PublicCredentialsPallet::<R>::on_chain_storage_version()
-			!= PublicCredentialsPallet::<R>::current_storage_version()
-		{
-			log::warn!(
-				"🚨 Public credentials pallet on chain version {:?} != declared storage version {:?}.",
-				PublicCredentialsPallet::<R>::on_chain_storage_version(),
-				PublicCredentialsPallet::<R>::current_storage_version()
-			)
+	#[cfg(feature = "try-runtime")]
+	fn pre_upgrade() -> Result<sp_std::vec::Vec<u8>, &'static str> {
+		log::info!("RemoveInsecureRandomnessPallet::pre_upgrade() checks 🔎");
+		if frame_support::migration::have_storage_value(PALLET_RUNTIME_NAME, PALLET_STORAGE_NAME, b"") {
+			Ok(sp_std::vec::Vec::default())
+		} else {
+			Err("Storage in pallet_insecure_randomness_collective_flip is already empty before migration.")
 		}
-
-		Ok(Vec::default())
 	}
 
-	fn on_runtime_upgrade() -> frame_support::weights::Weight {
-		Self::migrate()
-	}
-
-	fn post_upgrade(_state: Vec<u8>) -> Result<(), &'static str> {
-		type AttestationPallet<R> = attestation::Pallet<R>;
-		type CTypePallet<R> = ctype::Pallet<R>;
-		type DelegationPallet<R> = delegation::Pallet<R>;
-		type DidPallet<R> = did::Pallet<R>;
-		type LookupPallet<R> = pallet_did_lookup::Pallet<R>;
-		type InflationPallet<R> = pallet_inflation::Pallet<R>;
-		type Web3NamesPallet<R> = pallet_web3_names::Pallet<R>;
-		type ParachainStakingPallet<R> = parachain_staking::Pallet<R>;
-		type PublicCredentialsPallet<R> = public_credentials::Pallet<R>;
-
-		assert_eq!(
-			AttestationPallet::<R>::on_chain_storage_version(),
-			AttestationPallet::<R>::current_storage_version(),
-			"Attestation pallet on chain version {:?} != declared storage version {:?}.",
-			AttestationPallet::<R>::on_chain_storage_version(),
-			AttestationPallet::<R>::current_storage_version()
-		);
-		// Although it's part of a different migration, we check that the CType pallet
-		// storage version is also consistent.
-		assert_eq!(
-			CTypePallet::<R>::on_chain_storage_version(),
-			CTypePallet::<R>::current_storage_version(),
-			"CType pallet on chain version {:?} != declared storage version {:?}.",
-			CTypePallet::<R>::on_chain_storage_version(),
-			CTypePallet::<R>::current_storage_version()
+	fn on_runtime_upgrade() -> Weight {
+		let MultiRemovalResults { unique, .. } = clear_prefix(
+			&Twox128::hash(PALLET_RUNTIME_NAME),
+			// Storage version and `RandomMaterial` vector.
+			Some(2),
+			None,
 		);
-		assert_eq!(
-			DelegationPallet::<R>::on_chain_storage_version(),
-			DelegationPallet::<R>::current_storage_version(),
-			"Delegation pallet on chain version {:?} != declared storage version {:?}.",
-			DelegationPallet::<R>::on_chain_storage_version(),
-			DelegationPallet::<R>::current_storage_version()
-		);
-		assert_eq!(
-			DidPallet::<R>::on_chain_storage_version(),
-			DidPallet::<R>::current_storage_version(),
-			"Did pallet on chain version {:?} != declared storage version {:?}.",
-			DidPallet::<R>::on_chain_storage_version(),
-			DidPallet::<R>::current_storage_version()
-		);
-		assert_eq!(
-			LookupPallet::<R>::on_chain_storage_version(),
-			LookupPallet::<R>::current_storage_version(),
-			"Lookup pallet on chain version {:?} != declared storage version {:?}.",
-			LookupPallet::<R>::on_chain_storage_version(),
-			LookupPallet::<R>::current_storage_version()
-		);
-		assert_eq!(
-			InflationPallet::<R>::on_chain_storage_version(),
-			InflationPallet::<R>::current_storage_version(),
-			"Inflation pallet on chain version {:?} != declared storage version {:?}.",
-			InflationPallet::<R>::on_chain_storage_version(),
-			InflationPallet::<R>::current_storage_version()
-		);
-		assert_eq!(
-			Web3NamesPallet::<R>::on_chain_storage_version(),
-			Web3NamesPallet::<R>::current_storage_version(),
-			"Web3names pallet on chain version {:?} != declared storage version {:?}.",
-			Web3NamesPallet::<R>::on_chain_storage_version(),
-			Web3NamesPallet::<R>::current_storage_version()
-		);
-		assert_eq!(
-			ParachainStakingPallet::<R>::on_chain_storage_version(),
-			ParachainStakingPallet::<R>::current_storage_version(),
-			"Parachain staking pallet on chain version {:?} != declared storage version {:?}.",
-			ParachainStakingPallet::<R>::on_chain_storage_version(),
-			ParachainStakingPallet::<R>::current_storage_version()
-		);
-		assert_eq!(
-			PublicCredentialsPallet::<R>::on_chain_storage_version(),
-			PublicCredentialsPallet::<R>::current_storage_version(),
-			"Public credentials pallet on chain version {:?} != declared storage version {:?}.",
-			PublicCredentialsPallet::<R>::on_chain_storage_version(),
-			PublicCredentialsPallet::<R>::current_storage_version()
+		log::info!(
+			"Deleted {} elements from the pallet_insecure_randomness_collective_flip pallet storage.",
+			unique
 		);
-
-		log::info!("💿  Storage version post checks ok ✅");
-
-		Ok(())
+		T::DbWeight::get().writes(unique.into())
 	}
-}
 
-#[cfg(not(feature = "try-runtime"))]
-impl<R> OnRuntimeUpgrade for MigrateToNewStorageVersion<R>
-where
-	R: attestation::Config + pallet_web3_names::Config + public_credentials::Config,
-{
-	fn on_runtime_upgrade() -> frame_support::weights::Weight {
-		Self::migrate()
+	#[cfg(feature = "try-runtime")]
+	fn post_upgrade(_state: sp_std::vec::Vec<u8>) -> Result<(), &'static str> {
+		log::info!("RemoveInsecureRandomnessPallet::post_upgrade() checks 🔍");
+		if frame_support::migration::have_storage_value(PALLET_RUNTIME_NAME, PALLET_STORAGE_NAME, b"") {
+			Err("Storage in pallet_insecure_randomness_collective_flip is not empty after migration.")
+		} else {
+			Ok(())
+		}
 	}
 }
diff --git a/runtimes/peregrine/Cargo.toml b/runtimes/peregrine/Cargo.toml
index f229b0be2e..e08459be90 100644
--- a/runtimes/peregrine/Cargo.toml
+++ b/runtimes/peregrine/Cargo.toml
@@ -18,7 +18,7 @@ sp-io.workspace = true
 
 [dependencies]
 # External dependencies
-codec = {package = "parity-scale-codec", workspace = true, features = ["derive"]}
+parity-scale-codec = {workspace = true, features = ["derive"]}
 log.workspace = true
 scale-info = {workspace = true, features = ["derive"]}
 
@@ -71,7 +71,6 @@ pallet-membership.workspace = true
 pallet-multisig.workspace = true
 pallet-preimage.workspace = true
 pallet-proxy.workspace = true
-pallet-randomness-collective-flip.workspace = true
 pallet-scheduler.workspace = true
 pallet-session.workspace = true
 pallet-sudo.workspace = true
@@ -151,7 +150,7 @@ runtime-benchmarks = [
 ]
 std = [
   "attestation/std",
-  "codec/std",
+  "parity-scale-codec/std",
   "ctype/std",
   "cumulus-pallet-aura-ext/std",
   "cumulus-pallet-dmp-queue/std",
@@ -189,7 +188,6 @@ std = [
   "pallet-multisig/std",
   "pallet-preimage/std",
   "pallet-proxy/std",
-  "pallet-randomness-collective-flip/std",
   "pallet-scheduler/std",
   "pallet-session/std",
   "pallet-sudo/std",
@@ -250,7 +248,6 @@ try-runtime = [
   "pallet-multisig/try-runtime",
   "pallet-preimage/try-runtime",
   "pallet-proxy/try-runtime",
-  "pallet-randomness-collective-flip/try-runtime",
   "pallet-scheduler/try-runtime",
   "pallet-session/try-runtime",
   "pallet-sudo/try-runtime",
diff --git a/runtimes/peregrine/src/lib.rs b/runtimes/peregrine/src/lib.rs
index 06553443a0..3ad3807e22 100644
--- a/runtimes/peregrine/src/lib.rs
+++ b/runtimes/peregrine/src/lib.rs
@@ -25,14 +25,14 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
-use codec::{Decode, Encode, MaxEncodedLen};
 use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
 use frame_support::{
 	construct_runtime, parameter_types,
 	traits::{ConstU32, EitherOfDiverse, InstanceFilter, PrivilegeCmp},
 	weights::{ConstantMultiplier, Weight},
 };
-use frame_system::EnsureRoot;
+use frame_system::{EnsureRoot, EnsureSigned};
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 
 #[cfg(feature = "try-runtime")]
 use frame_try_runtime::UpgradeCheckSelect;
@@ -70,7 +70,7 @@ use crate::xcm_config::{XcmConfig, XcmOriginToTransactDispatchOrigin};
 #[cfg(feature = "std")]
 use sp_version::NativeVersion;
 #[cfg(feature = "runtime-benchmarks")]
-use {frame_system::EnsureSigned, kilt_support::signature::AlwaysVerify, runtime_common::benchmarks::DummySignature};
+use {kilt_support::signature::AlwaysVerify, runtime_common::benchmarks::DummySignature};
 
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
@@ -438,6 +438,7 @@ impl pallet_democracy::Config for Runtime {
 	type Preimages = Preimage;
 	type MaxDeposits = ConstU32<100>;
 	type MaxBlacklisted = ConstU32<100>;
+	type SubmitOrigin = EnsureSigned<AccountId>;
 }
 
 parameter_types! {
@@ -487,6 +488,7 @@ impl pallet_collective::Config<CouncilCollective> for Runtime {
 	type MaxMembers = constants::governance::CouncilMaxMembers;
 	type DefaultVote = pallet_collective::PrimeDefaultVote;
 	type WeightInfo = weights::pallet_collective::WeightInfo<Runtime>;
+	type SetMembersOrigin = EnsureRoot<AccountId>;
 }
 
 type TechnicalCollective = pallet_collective::Instance2;
@@ -499,6 +501,7 @@ impl pallet_collective::Config<TechnicalCollective> for Runtime {
 	type MaxMembers = constants::governance::TechnicalMaxMembers;
 	type DefaultVote = pallet_collective::PrimeDefaultVote;
 	type WeightInfo = weights::pallet_collective::WeightInfo<Runtime>;
+	type SetMembersOrigin = EnsureRoot<AccountId>;
 }
 
 type TechnicalMembershipProvider = pallet_membership::Instance1;
@@ -699,8 +702,6 @@ impl pallet_utility::Config for Runtime {
 	type WeightInfo = weights::pallet_utility::WeightInfo<Runtime>;
 }
 
-impl pallet_randomness_collective_flip::Config for Runtime {}
-
 impl public_credentials::Config for Runtime {
 	type AccessControl = PalletAuthorize<DelegationAc<Runtime>>;
 	type AttesterId = DidIdentifier;
@@ -929,7 +930,7 @@ construct_runtime! {
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
 		System: frame_system = 0,
-		RandomnessCollectiveFlip: pallet_randomness_collective_flip = 1,
+		// DELETED: RandomnessCollectiveFlip: pallet_insecure_randomness_collective_flip = 1,
 
 		Timestamp: pallet_timestamp = 2,
 		Indices: pallet_indices::{Pallet, Call, Storage, Event<T>} = 5,
@@ -1087,7 +1088,7 @@ pub type Executive = frame_executive::Executive<
 	Runtime,
 	// Executes pallet hooks in the order of definition in construct_runtime
 	AllPalletsWithSystem,
-	pallet_did_lookup::migrations::EthereumMigration<Runtime>,
+	runtime_common::migrations::RemoveInsecureRandomnessPallet<Runtime>,
 >;
 
 #[cfg(feature = "runtime-benchmarks")]
@@ -1149,7 +1150,7 @@ impl_runtime_apis! {
 
 	impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {
 		fn account_nonce(account: AccountId) -> Index {
-			frame_system::Pallet::<Runtime>::account_nonce(&account)
+			frame_system::Pallet::<Runtime>::account_nonce(account)
 		}
 	}
 
diff --git a/runtimes/peregrine/src/tests.rs b/runtimes/peregrine/src/tests.rs
index 10bfaf4ad6..37e5535fe9 100644
--- a/runtimes/peregrine/src/tests.rs
+++ b/runtimes/peregrine/src/tests.rs
@@ -16,11 +16,11 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::MaxEncodedLen;
 use frame_support::{
 	traits::{Contains, Currency},
 	BoundedVec,
 };
+use parity_scale_codec::MaxEncodedLen;
 
 use did::DeriveDidCallAuthorizationVerificationKeyRelationship;
 use pallet_did_lookup::{associate_account_request::AssociateAccountRequest, MigrationState};
diff --git a/runtimes/peregrine/src/weights/pallet_democracy.rs b/runtimes/peregrine/src/weights/pallet_democracy.rs
index 1df4755655..a8644da5bf 100644
--- a/runtimes/peregrine/src/weights/pallet_democracy.rs
+++ b/runtimes/peregrine/src/weights/pallet_democracy.rs
@@ -1,46 +1,26 @@
-// TODO: UPDATE BEFORE RELEASE
-
-// KILT Blockchain – https://botlabs.org
-// Copyright (C) 2019-2023 BOTLabs GmbH
-
-// The KILT Blockchain is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// The KILT Blockchain is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-// If you feel like getting in touch with us, you can do so at info@botlabs.org
 
 //! Autogenerated weights for `pallet_democracy`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-04-05, STEPS: `2`, REPEAT: `1`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-04-13, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `rust-2`, CPU: `12th Gen Intel(R) Core(TM) i9-12900K`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("spiritnet-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/kilt-parachain
+// ./target/debug/kilt-parachain
 // benchmark
 // pallet
-// --template=.maintain/runtime-weight-template.hbs
-// --header=HEADER-GPL
+// --chain=spiritnet-dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_democracy
+// --extrinsic=*
 // --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --steps=2
-// --repeat=1
-// --chain=dev
-// --pallet=pallet-democracy
-// --extrinsic=*
-// --output=./runtimes/peregrine/src/weights/pallet_democracy.rs
+// --output=./runtimes/spiritnet/src/weights/pallet_democracy.rs
+// --template=.maintain/runtime-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -64,8 +44,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `4801`
 		//  Estimated: `23413`
-		// Minimum execution time: 30_568_000 picoseconds.
-		Weight::from_parts(30_568_000, 0)
+		// Minimum execution time: 391_426_000 picoseconds.
+		Weight::from_parts(403_798_000, 0)
 			.saturating_add(Weight::from_parts(0, 23413))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -76,8 +56,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3557`
 		//  Estimated: `5705`
-		// Minimum execution time: 28_324_000 picoseconds.
-		Weight::from_parts(28_324_000, 0)
+		// Minimum execution time: 336_716_000 picoseconds.
+		Weight::from_parts(358_164_000, 0)
 			.saturating_add(Weight::from_parts(0, 5705))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -90,10 +70,10 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
 	fn vote_new() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3775`
+		//  Measured:  `3785`
 		//  Estimated: `12732`
-		// Minimum execution time: 37_208_000 picoseconds.
-		Weight::from_parts(37_208_000, 0)
+		// Minimum execution time: 463_501_000 picoseconds.
+		Weight::from_parts(476_502_000, 0)
 			.saturating_add(Weight::from_parts(0, 12732))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -106,10 +86,10 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
 	fn vote_existing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3797`
+		//  Measured:  `3807`
 		//  Estimated: `12732`
-		// Minimum execution time: 42_062_000 picoseconds.
-		Weight::from_parts(42_062_000, 0)
+		// Minimum execution time: 457_181_000 picoseconds.
+		Weight::from_parts(477_086_000, 0)
 			.saturating_add(Weight::from_parts(0, 12732))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -118,15 +98,17 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
 	/// Storage: Democracy Cancellations (r:1 w:1)
 	/// Proof: Democracy Cancellations (max_values: None, max_size: Some(33), added: 2508, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:1 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
 	fn emergency_cancel() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `261`
-		//  Estimated: `5192`
-		// Minimum execution time: 32_625_000 picoseconds.
-		Weight::from_parts(32_625_000, 0)
-			.saturating_add(Weight::from_parts(0, 5192))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `339`
+		//  Estimated: `7720`
+		// Minimum execution time: 325_258_000 picoseconds.
+		Weight::from_parts(338_238_000, 0)
+			.saturating_add(Weight::from_parts(0, 7720))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	/// Storage: Democracy PublicProps (r:1 w:1)
 	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
@@ -134,6 +116,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	/// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
 	/// Storage: System Account (r:2 w:2)
 	/// Proof: System Account (max_values: None, max_size: Some(132), added: 2607, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:3 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
 	/// Storage: Democracy NextExternal (r:1 w:1)
 	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
 	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
@@ -142,13 +126,13 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	/// Proof: Democracy Blacklist (max_values: None, max_size: Some(3242), added: 5717, mode: MaxEncodedLen)
 	fn blacklist() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `6377`
-		//  Estimated: `31427`
-		// Minimum execution time: 71_562_000 picoseconds.
-		Weight::from_parts(71_562_000, 0)
-			.saturating_add(Weight::from_parts(0, 31427))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(7))
+		//  Measured:  `6455`
+		//  Estimated: `39011`
+		// Minimum execution time: 950_796_000 picoseconds.
+		Weight::from_parts(977_506_000, 0)
+			.saturating_add(Weight::from_parts(0, 39011))
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(8))
 	}
 	/// Storage: Democracy NextExternal (r:1 w:1)
 	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
@@ -158,8 +142,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3385`
 		//  Estimated: `6344`
-		// Minimum execution time: 13_630_000 picoseconds.
-		Weight::from_parts(13_630_000, 0)
+		// Minimum execution time: 167_103_000 picoseconds.
+		Weight::from_parts(173_910_000, 0)
 			.saturating_add(Weight::from_parts(0, 6344))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -170,8 +154,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_299_000 picoseconds.
-		Weight::from_parts(4_299_000, 0)
+		// Minimum execution time: 48_069_000 picoseconds.
+		Weight::from_parts(50_061_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -181,8 +165,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_461_000 picoseconds.
-		Weight::from_parts(4_461_000, 0)
+		// Minimum execution time: 48_294_000 picoseconds.
+		Weight::from_parts(49_893_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -190,31 +174,35 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
 	/// Storage: Democracy ReferendumCount (r:1 w:1)
 	/// Proof: Democracy ReferendumCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:1 w:2)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
 	/// Storage: Democracy ReferendumInfoOf (r:0 w:1)
 	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
 	fn fast_track() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `145`
-		//  Estimated: `1126`
-		// Minimum execution time: 30_374_000 picoseconds.
-		Weight::from_parts(30_374_000, 0)
-			.saturating_add(Weight::from_parts(0, 1126))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(3))
+		//  Measured:  `219`
+		//  Estimated: `3654`
+		// Minimum execution time: 355_300_000 picoseconds.
+		Weight::from_parts(365_473_000, 0)
+			.saturating_add(Weight::from_parts(0, 3654))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(5))
 	}
 	/// Storage: Democracy NextExternal (r:1 w:1)
 	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
 	/// Storage: Democracy Blacklist (r:1 w:1)
 	/// Proof: Democracy Blacklist (max_values: None, max_size: Some(3242), added: 5717, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:1 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
 	fn veto_external() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3414`
-		//  Estimated: `6344`
-		// Minimum execution time: 35_353_000 picoseconds.
-		Weight::from_parts(35_353_000, 0)
-			.saturating_add(Weight::from_parts(0, 6344))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `3488`
+		//  Estimated: `8872`
+		// Minimum execution time: 336_000_000 picoseconds.
+		Weight::from_parts(348_874_000, 0)
+			.saturating_add(Weight::from_parts(0, 8872))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	/// Storage: Democracy PublicProps (r:1 w:1)
 	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
@@ -222,26 +210,31 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	/// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
 	/// Storage: System Account (r:2 w:2)
 	/// Proof: System Account (max_values: None, max_size: Some(132), added: 2607, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:1 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
 	fn cancel_proposal() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `6248`
-		//  Estimated: `28116`
-		// Minimum execution time: 65_095_000 picoseconds.
-		Weight::from_parts(65_095_000, 0)
-			.saturating_add(Weight::from_parts(0, 28116))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
+		//  Measured:  `6326`
+		//  Estimated: `30644`
+		// Minimum execution time: 736_633_000 picoseconds.
+		Weight::from_parts(771_455_000, 0)
+			.saturating_add(Weight::from_parts(0, 30644))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(5))
+	}
+	/// Storage: Democracy MetadataOf (r:1 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
 	/// Storage: Democracy ReferendumInfoOf (r:0 w:1)
 	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
 	fn cancel_referendum() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 9_316_000 picoseconds.
-		Weight::from_parts(9_316_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
+		//  Measured:  `204`
+		//  Estimated: `2528`
+		// Minimum execution time: 240_121_000 picoseconds.
+		Weight::from_parts(256_282_000, 0)
+			.saturating_add(Weight::from_parts(0, 2528))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: Democracy LowestUnbaked (r:1 w:1)
 	/// Proof: Democracy LowestUnbaked (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
@@ -250,15 +243,19 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	/// Storage: Democracy ReferendumInfoOf (r:99 w:0)
 	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
 	/// The range of component `r` is `[0, 99]`.
-	fn on_initialize_base(_r: u32, ) -> Weight {
+	fn on_initialize_base(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `116 + r * (125 ±0)`
-		//  Estimated: `266714`
-		// Minimum execution time: 8_159_000 picoseconds.
-		Weight::from_parts(188_676_000, 0)
-			.saturating_add(Weight::from_parts(0, 266714))
-			.saturating_add(T::DbWeight::get().reads(101))
+		//  Measured:  `177 + r * (125 ±0)`
+		//  Estimated: `998 + r * (2684 ±0)`
+		// Minimum execution time: 97_106_000 picoseconds.
+		Weight::from_parts(135_372_515, 0)
+			.saturating_add(Weight::from_parts(0, 998))
+			// Standard Error: 50_648
+			.saturating_add(Weight::from_parts(24_677_405, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(1))
+			.saturating_add(Weight::from_parts(0, 2684).saturating_mul(r.into()))
 	}
 	/// Storage: Democracy LowestUnbaked (r:1 w:1)
 	/// Proof: Democracy LowestUnbaked (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
@@ -273,15 +270,19 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	/// Storage: Democracy ReferendumInfoOf (r:99 w:0)
 	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
 	/// The range of component `r` is `[0, 99]`.
-	fn on_initialize_base_with_launch_period(_r: u32, ) -> Weight {
+	fn on_initialize_base_with_launch_period(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `116 + r * (125 ±0)`
-		//  Estimated: `285034`
-		// Minimum execution time: 23_545_000 picoseconds.
-		Weight::from_parts(200_397_000, 0)
-			.saturating_add(Weight::from_parts(0, 285034))
-			.saturating_add(T::DbWeight::get().reads(104))
+		//  Measured:  `177 + r * (125 ±0)`
+		//  Estimated: `19318 + r * (2684 ±0)`
+		// Minimum execution time: 134_450_000 picoseconds.
+		Weight::from_parts(167_194_729, 0)
+			.saturating_add(Weight::from_parts(0, 19318))
+			// Standard Error: 56_230
+			.saturating_add(Weight::from_parts(24_558_645, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(1))
+			.saturating_add(Weight::from_parts(0, 2684).saturating_mul(r.into()))
 	}
 	/// Storage: Democracy VotingOf (r:3 w:3)
 	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3799), added: 6274, mode: MaxEncodedLen)
@@ -290,30 +291,40 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	/// Storage: Balances Locks (r:1 w:1)
 	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
 	/// The range of component `r` is `[0, 99]`.
-	fn delegate(_r: u32, ) -> Weight {
+	fn delegate(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `970 + r * (149 ±0)`
-		//  Estimated: `288312`
-		// Minimum execution time: 26_565_000 picoseconds.
-		Weight::from_parts(290_374_000, 0)
-			.saturating_add(Weight::from_parts(0, 288312))
-			.saturating_add(T::DbWeight::get().reads(103))
-			.saturating_add(T::DbWeight::get().writes(103))
+		//  Measured:  `1175 + r * (147 ±0)`
+		//  Estimated: `22596 + r * (2684 ±0)`
+		// Minimum execution time: 443_753_000 picoseconds.
+		Weight::from_parts(491_067_445, 0)
+			.saturating_add(Weight::from_parts(0, 22596))
+			// Standard Error: 64_544
+			.saturating_add(Weight::from_parts(34_444_009, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+			.saturating_add(T::DbWeight::get().writes(4))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 2684).saturating_mul(r.into()))
 	}
 	/// Storage: Democracy VotingOf (r:2 w:2)
 	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3799), added: 6274, mode: MaxEncodedLen)
 	/// Storage: Democracy ReferendumInfoOf (r:99 w:99)
 	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
 	/// The range of component `r` is `[0, 99]`.
-	fn undelegate(_r: u32, ) -> Weight {
+	fn undelegate(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `463 + r * (147 ±0)`
-		//  Estimated: `278264`
-		// Minimum execution time: 19_519_000 picoseconds.
-		Weight::from_parts(269_824_000, 0)
-			.saturating_add(Weight::from_parts(0, 278264))
-			.saturating_add(T::DbWeight::get().reads(101))
-			.saturating_add(T::DbWeight::get().writes(101))
+		//  Measured:  `498 + r * (147 ±0)`
+		//  Estimated: `12548 + r * (2684 ±0)`
+		// Minimum execution time: 228_685_000 picoseconds.
+		Weight::from_parts(253_113_981, 0)
+			.saturating_add(Weight::from_parts(0, 12548))
+			// Standard Error: 57_716
+			.saturating_add(Weight::from_parts(34_357_704, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+			.saturating_add(T::DbWeight::get().writes(2))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 2684).saturating_mul(r.into()))
 	}
 	/// Storage: Democracy PublicProps (r:0 w:1)
 	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
@@ -321,8 +332,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_709_000 picoseconds.
-		Weight::from_parts(3_709_000, 0)
+		// Minimum execution time: 44_641_000 picoseconds.
+		Weight::from_parts(45_432_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -333,13 +344,15 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	/// Storage: System Account (r:1 w:1)
 	/// Proof: System Account (max_values: None, max_size: Some(132), added: 2607, mode: MaxEncodedLen)
 	/// The range of component `r` is `[0, 99]`.
-	fn unlock_remove(_r: u32, ) -> Weight {
+	fn unlock_remove(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `961 + r * (2 ±0)`
+		//  Measured:  `1174`
 		//  Estimated: `12655`
-		// Minimum execution time: 21_870_000 picoseconds.
-		Weight::from_parts(24_523_000, 0)
+		// Minimum execution time: 284_595_000 picoseconds.
+		Weight::from_parts(327_755_779, 0)
 			.saturating_add(Weight::from_parts(0, 12655))
+			// Standard Error: 11_210
+			.saturating_add(Weight::from_parts(137_449, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
@@ -350,13 +363,15 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	/// Storage: System Account (r:1 w:1)
 	/// Proof: System Account (max_values: None, max_size: Some(132), added: 2607, mode: MaxEncodedLen)
 	/// The range of component `r` is `[0, 99]`.
-	fn unlock_set(_r: u32, ) -> Weight {
+	fn unlock_set(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1164 + r * (22 ±0)`
+		//  Measured:  `1175 + r * (22 ±0)`
 		//  Estimated: `12655`
-		// Minimum execution time: 18_978_000 picoseconds.
-		Weight::from_parts(26_356_000, 0)
+		// Minimum execution time: 300_979_000 picoseconds.
+		Weight::from_parts(315_902_954, 0)
 			.saturating_add(Weight::from_parts(0, 12655))
+			// Standard Error: 10_152
+			.saturating_add(Weight::from_parts(156_423, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
@@ -365,13 +380,15 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	/// Storage: Democracy VotingOf (r:1 w:1)
 	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3799), added: 6274, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 100]`.
-	fn remove_vote(_r: u32, ) -> Weight {
+	fn remove_vote(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `411 + r * (28 ±0)`
+		//  Measured:  `736 + r * (26 ±0)`
 		//  Estimated: `8958`
-		// Minimum execution time: 11_696_000 picoseconds.
-		Weight::from_parts(17_342_000, 0)
+		// Minimum execution time: 173_714_000 picoseconds.
+		Weight::from_parts(188_190_880, 0)
 			.saturating_add(Weight::from_parts(0, 8958))
+			// Standard Error: 16_349
+			.saturating_add(Weight::from_parts(316_832, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -380,16 +397,106 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	/// Storage: Democracy VotingOf (r:1 w:1)
 	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3799), added: 6274, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 100]`.
-	fn remove_other_vote(_r: u32, ) -> Weight {
+	fn remove_other_vote(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `411 + r * (28 ±0)`
+		//  Measured:  `736 + r * (26 ±0)`
 		//  Estimated: `8958`
-		// Minimum execution time: 12_265_000 picoseconds.
-		Weight::from_parts(20_865_000, 0)
+		// Minimum execution time: 172_766_000 picoseconds.
+		Weight::from_parts(191_041_808, 0)
 			.saturating_add(Weight::from_parts(0, 8958))
+			// Standard Error: 6_999
+			.saturating_add(Weight::from_parts(243_399, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
+	/// Storage: Democracy NextExternal (r:1 w:0)
+	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
+	/// Storage: Preimage StatusFor (r:1 w:0)
+	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:0 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
+	fn set_external_metadata() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `356`
+		//  Estimated: `3193`
+		// Minimum execution time: 243_012_000 picoseconds.
+		Weight::from_parts(248_418_000, 0)
+			.saturating_add(Weight::from_parts(0, 3193))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: Democracy NextExternal (r:1 w:0)
+	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:1 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
+	fn clear_external_metadata() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `219`
+		//  Estimated: `3155`
+		// Minimum execution time: 204_309_000 picoseconds.
+		Weight::from_parts(209_560_000, 0)
+			.saturating_add(Weight::from_parts(0, 3155))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: Democracy PublicProps (r:1 w:0)
+	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
+	/// Storage: Preimage StatusFor (r:1 w:0)
+	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:0 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
+	fn set_proposal_metadata() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `4919`
+		//  Estimated: `19763`
+		// Minimum execution time: 347_393_000 picoseconds.
+		Weight::from_parts(361_504_000, 0)
+			.saturating_add(Weight::from_parts(0, 19763))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: Democracy PublicProps (r:1 w:0)
+	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:1 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
+	fn clear_proposal_metadata() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `4786`
+		//  Estimated: `19725`
+		// Minimum execution time: 321_543_000 picoseconds.
+		Weight::from_parts(334_617_000, 0)
+			.saturating_add(Weight::from_parts(0, 19725))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: Preimage StatusFor (r:1 w:0)
+	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:0 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
+	fn set_referendum_metadata() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `211`
+		//  Estimated: `2566`
+		// Minimum execution time: 167_747_000 picoseconds.
+		Weight::from_parts(174_889_000, 0)
+			.saturating_add(Weight::from_parts(0, 2566))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: Democracy ReferendumInfoOf (r:1 w:0)
+	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:1 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
+	fn clear_referendum_metadata() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `239`
+		//  Estimated: `5212`
+		// Minimum execution time: 220_441_000 picoseconds.
+		Weight::from_parts(224_200_000, 0)
+			.saturating_add(Weight::from_parts(0, 5212))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
 }
 
 #[cfg(test)]
@@ -451,7 +558,7 @@ mod tests {
 				.max_extrinsic
 				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
 				.proof_size()
-				> 5192
+				> 7720
 		);
 	}
 	#[test]
@@ -463,7 +570,7 @@ mod tests {
 				.max_extrinsic
 				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
 				.proof_size()
-				> 31427
+				> 39011
 		);
 	}
 	#[test]
@@ -487,7 +594,7 @@ mod tests {
 				.max_extrinsic
 				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
 				.proof_size()
-				> 1126
+				> 3654
 		);
 	}
 	#[test]
@@ -499,7 +606,7 @@ mod tests {
 				.max_extrinsic
 				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
 				.proof_size()
-				> 6344
+				> 8872
 		);
 	}
 	#[test]
@@ -511,7 +618,19 @@ mod tests {
 				.max_extrinsic
 				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
 				.proof_size()
-				> 28116
+				> 30644
+		);
+	}
+	#[test]
+	fn test_cancel_referendum() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 2528
 		);
 	}
 	#[test]
@@ -523,7 +642,7 @@ mod tests {
 				.max_extrinsic
 				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
 				.proof_size()
-				> 266714
+				> 998
 		);
 	}
 	#[test]
@@ -535,7 +654,7 @@ mod tests {
 				.max_extrinsic
 				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
 				.proof_size()
-				> 285034
+				> 19318
 		);
 	}
 	#[test]
@@ -547,7 +666,7 @@ mod tests {
 				.max_extrinsic
 				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
 				.proof_size()
-				> 288312
+				> 22596
 		);
 	}
 	#[test]
@@ -559,7 +678,7 @@ mod tests {
 				.max_extrinsic
 				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
 				.proof_size()
-				> 278264
+				> 12548
 		);
 	}
 	#[test]
@@ -610,4 +729,76 @@ mod tests {
 				> 8958
 		);
 	}
+	#[test]
+	fn test_set_external_metadata() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 3193
+		);
+	}
+	#[test]
+	fn test_clear_external_metadata() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 3155
+		);
+	}
+	#[test]
+	fn test_set_proposal_metadata() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 19763
+		);
+	}
+	#[test]
+	fn test_clear_proposal_metadata() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 19725
+		);
+	}
+	#[test]
+	fn test_set_referendum_metadata() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 2566
+		);
+	}
+	#[test]
+	fn test_clear_referendum_metadata() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 5212
+		);
+	}
 }
diff --git a/runtimes/spiritnet/Cargo.toml b/runtimes/spiritnet/Cargo.toml
index d390369449..4a5d0fe473 100644
--- a/runtimes/spiritnet/Cargo.toml
+++ b/runtimes/spiritnet/Cargo.toml
@@ -18,7 +18,7 @@ sp-io.workspace = true
 
 [dependencies]
 # External dependencies
-codec = {package = "parity-scale-codec", workspace = true, features = ["derive"]}
+parity-scale-codec = {workspace = true, features = ["derive"]}
 log.workspace = true
 scale-info = {workspace = true, features = ["derive"]}
 
@@ -71,7 +71,6 @@ pallet-membership.workspace = true
 pallet-multisig.workspace = true
 pallet-preimage.workspace = true
 pallet-proxy.workspace = true
-pallet-randomness-collective-flip.workspace = true
 pallet-scheduler.workspace = true
 pallet-session.workspace = true
 pallet-timestamp.workspace = true
@@ -150,7 +149,7 @@ runtime-benchmarks = [
 ]
 std = [
   "attestation/std",
-  "codec/std",
+  "parity-scale-codec/std",
   "ctype/std",
   "cumulus-pallet-aura-ext/std",
   "cumulus-pallet-dmp-queue/std",
@@ -186,7 +185,6 @@ std = [
   "pallet-membership/std",
   "pallet-preimage/std",
   "pallet-proxy/std",
-  "pallet-randomness-collective-flip/std",
   "pallet-scheduler/std",
   "pallet-session/std",
   "pallet-multisig/std",
@@ -247,7 +245,6 @@ try-runtime = [
   "pallet-membership/try-runtime",
   "pallet-preimage/try-runtime",
   "pallet-proxy/try-runtime",
-  "pallet-randomness-collective-flip/try-runtime",
   "pallet-scheduler/try-runtime",
   "pallet-session/try-runtime",
   "pallet-timestamp/try-runtime",
diff --git a/runtimes/spiritnet/src/lib.rs b/runtimes/spiritnet/src/lib.rs
index 49f2d962df..ce997d47d9 100644
--- a/runtimes/spiritnet/src/lib.rs
+++ b/runtimes/spiritnet/src/lib.rs
@@ -25,14 +25,14 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
-use codec::{Decode, Encode, MaxEncodedLen};
 use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
 use frame_support::{
 	construct_runtime, parameter_types,
 	traits::{ConstU32, EitherOfDiverse, InstanceFilter, PrivilegeCmp},
 	weights::{ConstantMultiplier, Weight},
 };
-use frame_system::EnsureRoot;
+use frame_system::{EnsureRoot, EnsureSigned};
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 
 #[cfg(feature = "try-runtime")]
 use frame_try_runtime::UpgradeCheckSelect;
@@ -70,7 +70,7 @@ use crate::xcm_config::{XcmConfig, XcmOriginToTransactDispatchOrigin};
 #[cfg(feature = "std")]
 use sp_version::NativeVersion;
 #[cfg(feature = "runtime-benchmarks")]
-use {frame_system::EnsureSigned, kilt_support::signature::AlwaysVerify, runtime_common::benchmarks::DummySignature};
+use {kilt_support::signature::AlwaysVerify, runtime_common::benchmarks::DummySignature};
 
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
@@ -433,6 +433,7 @@ impl pallet_democracy::Config for Runtime {
 	type Preimages = Preimage;
 	type MaxDeposits = ConstU32<100>;
 	type MaxBlacklisted = ConstU32<100>;
+	type SubmitOrigin = EnsureSigned<AccountId>;
 }
 
 parameter_types! {
@@ -482,6 +483,7 @@ impl pallet_collective::Config<CouncilCollective> for Runtime {
 	type MaxMembers = constants::governance::CouncilMaxMembers;
 	type DefaultVote = pallet_collective::PrimeDefaultVote;
 	type WeightInfo = weights::pallet_collective::WeightInfo<Runtime>;
+	type SetMembersOrigin = EnsureRoot<AccountId>;
 }
 
 type TechnicalCollective = pallet_collective::Instance2;
@@ -494,6 +496,7 @@ impl pallet_collective::Config<TechnicalCollective> for Runtime {
 	type MaxMembers = constants::governance::TechnicalMaxMembers;
 	type DefaultVote = pallet_collective::PrimeDefaultVote;
 	type WeightInfo = weights::pallet_collective::WeightInfo<Runtime>;
+	type SetMembersOrigin = EnsureRoot<AccountId>;
 }
 
 type TechnicalMembershipProvider = pallet_membership::Instance1;
@@ -696,8 +699,6 @@ impl pallet_utility::Config for Runtime {
 	type WeightInfo = weights::pallet_utility::WeightInfo<Runtime>;
 }
 
-impl pallet_randomness_collective_flip::Config for Runtime {}
-
 impl public_credentials::Config for Runtime {
 	type AccessControl = PalletAuthorize<DelegationAc<Runtime>>;
 	type AttesterId = DidIdentifier;
@@ -926,7 +927,7 @@ construct_runtime! {
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
 		System: frame_system = 0,
-		RandomnessCollectiveFlip: pallet_randomness_collective_flip = 1,
+		// DELETED: RandomnessCollectiveFlip: pallet_insecure_randomness_collective_flip = 1,
 
 		Timestamp: pallet_timestamp = 2,
 		Indices: pallet_indices::{Pallet, Call, Storage, Event<T>} = 5,
@@ -1081,7 +1082,7 @@ pub type Executive = frame_executive::Executive<
 	Runtime,
 	// Executes pallet hooks in the order of definition in construct_runtime
 	AllPalletsWithSystem,
-	pallet_did_lookup::migrations::EthereumMigration<Runtime>,
+	runtime_common::migrations::RemoveInsecureRandomnessPallet<Runtime>,
 >;
 
 #[cfg(feature = "runtime-benchmarks")]
@@ -1143,7 +1144,7 @@ impl_runtime_apis! {
 
 	impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {
 		fn account_nonce(account: AccountId) -> Index {
-			frame_system::Pallet::<Runtime>::account_nonce(&account)
+			frame_system::Pallet::<Runtime>::account_nonce(account)
 		}
 	}
 
diff --git a/runtimes/spiritnet/src/tests.rs b/runtimes/spiritnet/src/tests.rs
index 6e1ca2eb9c..a2d5e6a95d 100644
--- a/runtimes/spiritnet/src/tests.rs
+++ b/runtimes/spiritnet/src/tests.rs
@@ -16,11 +16,11 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::MaxEncodedLen;
 use frame_support::{
 	traits::{Contains, Currency},
 	BoundedVec,
 };
+use parity_scale_codec::MaxEncodedLen;
 
 use did::DeriveDidCallAuthorizationVerificationKeyRelationship;
 use pallet_did_lookup::{associate_account_request::AssociateAccountRequest, MigrationState};
diff --git a/runtimes/spiritnet/src/weights/pallet_democracy.rs b/runtimes/spiritnet/src/weights/pallet_democracy.rs
index acfd5c3527..a8644da5bf 100644
--- a/runtimes/spiritnet/src/weights/pallet_democracy.rs
+++ b/runtimes/spiritnet/src/weights/pallet_democracy.rs
@@ -1,35 +1,20 @@
-// KILT Blockchain – https://botlabs.org
-// Copyright (C) 2019-2023 BOTLabs GmbH
 
-// The KILT Blockchain is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// The KILT Blockchain is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-// If you feel like getting in touch with us, you can do so at info@botlabs.org
-
-//! Autogenerated weights for pallet_democracy
+//! Autogenerated weights for `pallet_democracy`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-03-10, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-04-13, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `rust-2`, CPU: `12th Gen Intel(R) Core(TM) i9-12900K`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("spiritnet-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/kilt-parachain
+// ./target/debug/kilt-parachain
 // benchmark
 // pallet
 // --chain=spiritnet-dev
 // --steps=50
 // --repeat=20
-// --pallet=pallet-democracy
+// --pallet=pallet_democracy
 // --extrinsic=*
 // --execution=wasm
 // --wasm-execution=compiled
@@ -40,252 +25,780 @@
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
 
 use frame_support::{traits::Get, weights::Weight};
 use sp_std::marker::PhantomData;
 
-/// Weights for `pallet_democracy`.
+/// Weight functions for `pallet_democracy`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
-	// Storage: Democracy PublicPropCount (r:1 w:1)
-	// Proof: Democracy PublicPropCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: Democracy PublicProps (r:1 w:1)
-	// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	// Storage: Democracy Blacklist (r:1 w:0)
-	// Proof: Democracy Blacklist (max_values: None, max_size: Some(3242), added: 5717, mode: MaxEncodedLen)
-	// Storage: Democracy DepositOf (r:0 w:1)
-	// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
+	/// Storage: Democracy PublicPropCount (r:1 w:1)
+	/// Proof: Democracy PublicPropCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: Democracy PublicProps (r:1 w:1)
+	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
+	/// Storage: Democracy Blacklist (r:1 w:0)
+	/// Proof: Democracy Blacklist (max_values: None, max_size: Some(3242), added: 5717, mode: MaxEncodedLen)
+	/// Storage: Democracy DepositOf (r:0 w:1)
+	/// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
 	fn propose() -> Weight {
-		Weight::from_ref_time(41_357_000 as u64)
-			.saturating_add(T::DbWeight::get().reads(3 as u64))
-			.saturating_add(T::DbWeight::get().writes(3 as u64))
+		// Proof Size summary in bytes:
+		//  Measured:  `4801`
+		//  Estimated: `23413`
+		// Minimum execution time: 391_426_000 picoseconds.
+		Weight::from_parts(403_798_000, 0)
+			.saturating_add(Weight::from_parts(0, 23413))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	// Storage: Democracy DepositOf (r:1 w:1)
-	// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
+	/// Storage: Democracy DepositOf (r:1 w:1)
+	/// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
 	fn second() -> Weight {
-		Weight::from_ref_time(38_472_000 as u64)
-			.saturating_add(T::DbWeight::get().reads(1 as u64))
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
-	}
-	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
-	// Storage: Democracy VotingOf (r:1 w:1)
-	// Proof: Democracy VotingOf (max_values: None, max_size: Some(3799), added: 6274, mode: MaxEncodedLen)
-	// Storage: Balances Locks (r:1 w:1)
-	// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
+		// Proof Size summary in bytes:
+		//  Measured:  `3557`
+		//  Estimated: `5705`
+		// Minimum execution time: 336_716_000 picoseconds.
+		Weight::from_parts(358_164_000, 0)
+			.saturating_add(Weight::from_parts(0, 5705))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
+	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
+	/// Storage: Democracy VotingOf (r:1 w:1)
+	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3799), added: 6274, mode: MaxEncodedLen)
+	/// Storage: Balances Locks (r:1 w:1)
+	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
 	fn vote_new() -> Weight {
-		Weight::from_ref_time(53_939_000 as u64)
-			.saturating_add(T::DbWeight::get().reads(3 as u64))
-			.saturating_add(T::DbWeight::get().writes(3 as u64))
-	}
-	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
-	// Storage: Democracy VotingOf (r:1 w:1)
-	// Proof: Democracy VotingOf (max_values: None, max_size: Some(3799), added: 6274, mode: MaxEncodedLen)
-	// Storage: Balances Locks (r:1 w:1)
-	// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
+		// Proof Size summary in bytes:
+		//  Measured:  `3785`
+		//  Estimated: `12732`
+		// Minimum execution time: 463_501_000 picoseconds.
+		Weight::from_parts(476_502_000, 0)
+			.saturating_add(Weight::from_parts(0, 12732))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
+	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
+	/// Storage: Democracy VotingOf (r:1 w:1)
+	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3799), added: 6274, mode: MaxEncodedLen)
+	/// Storage: Balances Locks (r:1 w:1)
+	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
 	fn vote_existing() -> Weight {
-		Weight::from_ref_time(54_056_000 as u64)
-			.saturating_add(T::DbWeight::get().reads(3 as u64))
-			.saturating_add(T::DbWeight::get().writes(3 as u64))
-	}
-	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
-	// Storage: Democracy Cancellations (r:1 w:1)
-	// Proof: Democracy Cancellations (max_values: None, max_size: Some(33), added: 2508, mode: MaxEncodedLen)
+		// Proof Size summary in bytes:
+		//  Measured:  `3807`
+		//  Estimated: `12732`
+		// Minimum execution time: 457_181_000 picoseconds.
+		Weight::from_parts(477_086_000, 0)
+			.saturating_add(Weight::from_parts(0, 12732))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
+	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
+	/// Storage: Democracy Cancellations (r:1 w:1)
+	/// Proof: Democracy Cancellations (max_values: None, max_size: Some(33), added: 2508, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:1 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
 	fn emergency_cancel() -> Weight {
-		Weight::from_ref_time(20_739_000 as u64)
-			.saturating_add(T::DbWeight::get().reads(2 as u64))
-			.saturating_add(T::DbWeight::get().writes(2 as u64))
-	}
-	// Storage: Democracy PublicProps (r:1 w:1)
-	// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	// Storage: Democracy DepositOf (r:1 w:1)
-	// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(132), added: 2607, mode: MaxEncodedLen)
-	// Storage: Democracy NextExternal (r:1 w:1)
-	// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
-	// Storage: Democracy Blacklist (r:0 w:1)
-	// Proof: Democracy Blacklist (max_values: None, max_size: Some(3242), added: 5717, mode: MaxEncodedLen)
+		// Proof Size summary in bytes:
+		//  Measured:  `339`
+		//  Estimated: `7720`
+		// Minimum execution time: 325_258_000 picoseconds.
+		Weight::from_parts(338_238_000, 0)
+			.saturating_add(Weight::from_parts(0, 7720))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: Democracy PublicProps (r:1 w:1)
+	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
+	/// Storage: Democracy DepositOf (r:1 w:1)
+	/// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
+	/// Storage: System Account (r:2 w:2)
+	/// Proof: System Account (max_values: None, max_size: Some(132), added: 2607, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:3 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
+	/// Storage: Democracy NextExternal (r:1 w:1)
+	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
+	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
+	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
+	/// Storage: Democracy Blacklist (r:0 w:1)
+	/// Proof: Democracy Blacklist (max_values: None, max_size: Some(3242), added: 5717, mode: MaxEncodedLen)
 	fn blacklist() -> Weight {
-		Weight::from_ref_time(91_361_000 as u64)
-			.saturating_add(T::DbWeight::get().reads(6 as u64))
-			.saturating_add(T::DbWeight::get().writes(7 as u64))
-	}
-	// Storage: Democracy NextExternal (r:1 w:1)
-	// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	// Storage: Democracy Blacklist (r:1 w:0)
-	// Proof: Democracy Blacklist (max_values: None, max_size: Some(3242), added: 5717, mode: MaxEncodedLen)
+		// Proof Size summary in bytes:
+		//  Measured:  `6455`
+		//  Estimated: `39011`
+		// Minimum execution time: 950_796_000 picoseconds.
+		Weight::from_parts(977_506_000, 0)
+			.saturating_add(Weight::from_parts(0, 39011))
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(8))
+	}
+	/// Storage: Democracy NextExternal (r:1 w:1)
+	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
+	/// Storage: Democracy Blacklist (r:1 w:0)
+	/// Proof: Democracy Blacklist (max_values: None, max_size: Some(3242), added: 5717, mode: MaxEncodedLen)
 	fn external_propose() -> Weight {
-		Weight::from_ref_time(15_200_000 as u64)
-			.saturating_add(T::DbWeight::get().reads(2 as u64))
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
+		// Proof Size summary in bytes:
+		//  Measured:  `3385`
+		//  Estimated: `6344`
+		// Minimum execution time: 167_103_000 picoseconds.
+		Weight::from_parts(173_910_000, 0)
+			.saturating_add(Weight::from_parts(0, 6344))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Democracy NextExternal (r:0 w:1)
-	// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
+	/// Storage: Democracy NextExternal (r:0 w:1)
+	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
 	fn external_propose_majority() -> Weight {
-		Weight::from_ref_time(3_980_000 as u64)
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 48_069_000 picoseconds.
+		Weight::from_parts(50_061_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: Democracy NextExternal (r:0 w:1)
-	// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
+	/// Storage: Democracy NextExternal (r:0 w:1)
+	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
 	fn external_propose_default() -> Weight {
-		Weight::from_ref_time(5_755_000 as u64)
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
-	}
-	// Storage: Democracy NextExternal (r:1 w:1)
-	// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	// Storage: Democracy ReferendumCount (r:1 w:1)
-	// Proof: Democracy ReferendumCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: Democracy ReferendumInfoOf (r:0 w:1)
-	// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 48_294_000 picoseconds.
+		Weight::from_parts(49_893_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: Democracy NextExternal (r:1 w:1)
+	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
+	/// Storage: Democracy ReferendumCount (r:1 w:1)
+	/// Proof: Democracy ReferendumCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:1 w:2)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
+	/// Storage: Democracy ReferendumInfoOf (r:0 w:1)
+	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
 	fn fast_track() -> Weight {
-		Weight::from_ref_time(30_441_000 as u64)
-			.saturating_add(T::DbWeight::get().reads(2 as u64))
-			.saturating_add(T::DbWeight::get().writes(3 as u64))
-	}
-	// Storage: Democracy NextExternal (r:1 w:1)
-	// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	// Storage: Democracy Blacklist (r:1 w:1)
-	// Proof: Democracy Blacklist (max_values: None, max_size: Some(3242), added: 5717, mode: MaxEncodedLen)
+		// Proof Size summary in bytes:
+		//  Measured:  `219`
+		//  Estimated: `3654`
+		// Minimum execution time: 355_300_000 picoseconds.
+		Weight::from_parts(365_473_000, 0)
+			.saturating_add(Weight::from_parts(0, 3654))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(5))
+	}
+	/// Storage: Democracy NextExternal (r:1 w:1)
+	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
+	/// Storage: Democracy Blacklist (r:1 w:1)
+	/// Proof: Democracy Blacklist (max_values: None, max_size: Some(3242), added: 5717, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:1 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
 	fn veto_external() -> Weight {
-		Weight::from_ref_time(39_010_000 as u64)
-			.saturating_add(T::DbWeight::get().reads(2 as u64))
-			.saturating_add(T::DbWeight::get().writes(2 as u64))
-	}
-	// Storage: Democracy PublicProps (r:1 w:1)
-	// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	// Storage: Democracy DepositOf (r:1 w:1)
-	// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(132), added: 2607, mode: MaxEncodedLen)
+		// Proof Size summary in bytes:
+		//  Measured:  `3488`
+		//  Estimated: `8872`
+		// Minimum execution time: 336_000_000 picoseconds.
+		Weight::from_parts(348_874_000, 0)
+			.saturating_add(Weight::from_parts(0, 8872))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: Democracy PublicProps (r:1 w:1)
+	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
+	/// Storage: Democracy DepositOf (r:1 w:1)
+	/// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen)
+	/// Storage: System Account (r:2 w:2)
+	/// Proof: System Account (max_values: None, max_size: Some(132), added: 2607, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:1 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
 	fn cancel_proposal() -> Weight {
-		Weight::from_ref_time(75_599_000 as u64)
-			.saturating_add(T::DbWeight::get().reads(4 as u64))
-			.saturating_add(T::DbWeight::get().writes(4 as u64))
+		// Proof Size summary in bytes:
+		//  Measured:  `6326`
+		//  Estimated: `30644`
+		// Minimum execution time: 736_633_000 picoseconds.
+		Weight::from_parts(771_455_000, 0)
+			.saturating_add(Weight::from_parts(0, 30644))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(5))
 	}
-	// Storage: Democracy ReferendumInfoOf (r:0 w:1)
-	// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:1 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
+	/// Storage: Democracy ReferendumInfoOf (r:0 w:1)
+	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
 	fn cancel_referendum() -> Weight {
-		Weight::from_ref_time(9_815_000 as u64)
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
-	}
-	// Storage: Democracy LowestUnbaked (r:1 w:1)
-	// Proof: Democracy LowestUnbaked (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: Democracy ReferendumCount (r:1 w:0)
-	// Proof: Democracy ReferendumCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: Democracy ReferendumInfoOf (r:99 w:0)
-	// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
+		// Proof Size summary in bytes:
+		//  Measured:  `204`
+		//  Estimated: `2528`
+		// Minimum execution time: 240_121_000 picoseconds.
+		Weight::from_parts(256_282_000, 0)
+			.saturating_add(Weight::from_parts(0, 2528))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: Democracy LowestUnbaked (r:1 w:1)
+	/// Proof: Democracy LowestUnbaked (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: Democracy ReferendumCount (r:1 w:0)
+	/// Proof: Democracy ReferendumCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: Democracy ReferendumInfoOf (r:99 w:0)
+	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
+	/// The range of component `r` is `[0, 99]`.
 	fn on_initialize_base(r: u32, ) -> Weight {
-		Weight::from_ref_time(19_503_022 as u64)
-			// Standard Error: 53_664
-			.saturating_add(Weight::from_ref_time(2_856_370 as u64).saturating_mul(r as u64))
-			.saturating_add(T::DbWeight::get().reads(2 as u64))
-			.saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64)))
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
-	}
-	// Storage: Democracy LowestUnbaked (r:1 w:1)
-	// Proof: Democracy LowestUnbaked (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: Democracy ReferendumCount (r:1 w:0)
-	// Proof: Democracy ReferendumCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: Democracy LastTabledWasExternal (r:1 w:0)
-	// Proof: Democracy LastTabledWasExternal (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	// Storage: Democracy NextExternal (r:1 w:0)
-	// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
-	// Storage: Democracy PublicProps (r:1 w:0)
-	// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
-	// Storage: Democracy ReferendumInfoOf (r:99 w:0)
-	// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
+		// Proof Size summary in bytes:
+		//  Measured:  `177 + r * (125 ±0)`
+		//  Estimated: `998 + r * (2684 ±0)`
+		// Minimum execution time: 97_106_000 picoseconds.
+		Weight::from_parts(135_372_515, 0)
+			.saturating_add(Weight::from_parts(0, 998))
+			// Standard Error: 50_648
+			.saturating_add(Weight::from_parts(24_677_405, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+			.saturating_add(T::DbWeight::get().writes(1))
+			.saturating_add(Weight::from_parts(0, 2684).saturating_mul(r.into()))
+	}
+	/// Storage: Democracy LowestUnbaked (r:1 w:1)
+	/// Proof: Democracy LowestUnbaked (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: Democracy ReferendumCount (r:1 w:0)
+	/// Proof: Democracy ReferendumCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: Democracy LastTabledWasExternal (r:1 w:0)
+	/// Proof: Democracy LastTabledWasExternal (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
+	/// Storage: Democracy NextExternal (r:1 w:0)
+	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
+	/// Storage: Democracy PublicProps (r:1 w:0)
+	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
+	/// Storage: Democracy ReferendumInfoOf (r:99 w:0)
+	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
+	/// The range of component `r` is `[0, 99]`.
 	fn on_initialize_base_with_launch_period(r: u32, ) -> Weight {
-		Weight::from_ref_time(24_531_505 as u64)
-			// Standard Error: 38_008
-			.saturating_add(Weight::from_ref_time(2_737_960 as u64).saturating_mul(r as u64))
-			.saturating_add(T::DbWeight::get().reads(5 as u64))
-			.saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64)))
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
-	}
-	// Storage: Democracy VotingOf (r:3 w:3)
-	// Proof: Democracy VotingOf (max_values: None, max_size: Some(3799), added: 6274, mode: MaxEncodedLen)
-	// Storage: Democracy ReferendumInfoOf (r:99 w:99)
-	// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
-	// Storage: Balances Locks (r:1 w:1)
-	// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
+		// Proof Size summary in bytes:
+		//  Measured:  `177 + r * (125 ±0)`
+		//  Estimated: `19318 + r * (2684 ±0)`
+		// Minimum execution time: 134_450_000 picoseconds.
+		Weight::from_parts(167_194_729, 0)
+			.saturating_add(Weight::from_parts(0, 19318))
+			// Standard Error: 56_230
+			.saturating_add(Weight::from_parts(24_558_645, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+			.saturating_add(T::DbWeight::get().writes(1))
+			.saturating_add(Weight::from_parts(0, 2684).saturating_mul(r.into()))
+	}
+	/// Storage: Democracy VotingOf (r:3 w:3)
+	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3799), added: 6274, mode: MaxEncodedLen)
+	/// Storage: Democracy ReferendumInfoOf (r:99 w:99)
+	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
+	/// Storage: Balances Locks (r:1 w:1)
+	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
+	/// The range of component `r` is `[0, 99]`.
 	fn delegate(r: u32, ) -> Weight {
-		Weight::from_ref_time(55_607_218 as u64)
-			// Standard Error: 23_527
-			.saturating_add(Weight::from_ref_time(3_788_777 as u64).saturating_mul(r as u64))
-			.saturating_add(T::DbWeight::get().reads(4 as u64))
-			.saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64)))
-			.saturating_add(T::DbWeight::get().writes(4 as u64))
-			.saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64)))
-	}
-	// Storage: Democracy VotingOf (r:2 w:2)
-	// Proof: Democracy VotingOf (max_values: None, max_size: Some(3799), added: 6274, mode: MaxEncodedLen)
-	// Storage: Democracy ReferendumInfoOf (r:99 w:99)
-	// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
+		// Proof Size summary in bytes:
+		//  Measured:  `1175 + r * (147 ±0)`
+		//  Estimated: `22596 + r * (2684 ±0)`
+		// Minimum execution time: 443_753_000 picoseconds.
+		Weight::from_parts(491_067_445, 0)
+			.saturating_add(Weight::from_parts(0, 22596))
+			// Standard Error: 64_544
+			.saturating_add(Weight::from_parts(34_444_009, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+			.saturating_add(T::DbWeight::get().writes(4))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 2684).saturating_mul(r.into()))
+	}
+	/// Storage: Democracy VotingOf (r:2 w:2)
+	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3799), added: 6274, mode: MaxEncodedLen)
+	/// Storage: Democracy ReferendumInfoOf (r:99 w:99)
+	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
+	/// The range of component `r` is `[0, 99]`.
 	fn undelegate(r: u32, ) -> Weight {
-		Weight::from_ref_time(28_991_971 as u64)
-			// Standard Error: 19_783
-			.saturating_add(Weight::from_ref_time(3_862_123 as u64).saturating_mul(r as u64))
-			.saturating_add(T::DbWeight::get().reads(2 as u64))
-			.saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64)))
-			.saturating_add(T::DbWeight::get().writes(2 as u64))
-			.saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64)))
-	}
-	// Storage: Democracy PublicProps (r:0 w:1)
-	// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
+		// Proof Size summary in bytes:
+		//  Measured:  `498 + r * (147 ±0)`
+		//  Estimated: `12548 + r * (2684 ±0)`
+		// Minimum execution time: 228_685_000 picoseconds.
+		Weight::from_parts(253_113_981, 0)
+			.saturating_add(Weight::from_parts(0, 12548))
+			// Standard Error: 57_716
+			.saturating_add(Weight::from_parts(34_357_704, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+			.saturating_add(T::DbWeight::get().writes(2))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 2684).saturating_mul(r.into()))
+	}
+	/// Storage: Democracy PublicProps (r:0 w:1)
+	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
 	fn clear_public_proposals() -> Weight {
-		Weight::from_ref_time(3_940_000 as u64)
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
-	}
-	// Storage: Democracy VotingOf (r:1 w:1)
-	// Proof: Democracy VotingOf (max_values: None, max_size: Some(3799), added: 6274, mode: MaxEncodedLen)
-	// Storage: Balances Locks (r:1 w:1)
-	// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(132), added: 2607, mode: MaxEncodedLen)
-	fn unlock_remove(_r: u32, ) -> Weight {
-		Weight::from_ref_time(33_468_660 as u64)
-			.saturating_add(T::DbWeight::get().reads(3 as u64))
-			.saturating_add(T::DbWeight::get().writes(3 as u64))
-	}
-	// Storage: Democracy VotingOf (r:1 w:1)
-	// Proof: Democracy VotingOf (max_values: None, max_size: Some(3799), added: 6274, mode: MaxEncodedLen)
-	// Storage: Balances Locks (r:1 w:1)
-	// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	// Storage: System Account (r:1 w:1)
-	// Proof: System Account (max_values: None, max_size: Some(132), added: 2607, mode: MaxEncodedLen)
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 44_641_000 picoseconds.
+		Weight::from_parts(45_432_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: Democracy VotingOf (r:1 w:1)
+	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3799), added: 6274, mode: MaxEncodedLen)
+	/// Storage: Balances Locks (r:1 w:1)
+	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
+	/// Storage: System Account (r:1 w:1)
+	/// Proof: System Account (max_values: None, max_size: Some(132), added: 2607, mode: MaxEncodedLen)
+	/// The range of component `r` is `[0, 99]`.
+	fn unlock_remove(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1174`
+		//  Estimated: `12655`
+		// Minimum execution time: 284_595_000 picoseconds.
+		Weight::from_parts(327_755_779, 0)
+			.saturating_add(Weight::from_parts(0, 12655))
+			// Standard Error: 11_210
+			.saturating_add(Weight::from_parts(137_449, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: Democracy VotingOf (r:1 w:1)
+	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3799), added: 6274, mode: MaxEncodedLen)
+	/// Storage: Balances Locks (r:1 w:1)
+	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
+	/// Storage: System Account (r:1 w:1)
+	/// Proof: System Account (max_values: None, max_size: Some(132), added: 2607, mode: MaxEncodedLen)
+	/// The range of component `r` is `[0, 99]`.
 	fn unlock_set(r: u32, ) -> Weight {
-		Weight::from_ref_time(31_989_980 as u64)
-			// Standard Error: 4_683
-			.saturating_add(Weight::from_ref_time(52_020 as u64).saturating_mul(r as u64))
-			.saturating_add(T::DbWeight::get().reads(3 as u64))
-			.saturating_add(T::DbWeight::get().writes(3 as u64))
-	}
-	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
-	// Storage: Democracy VotingOf (r:1 w:1)
-	// Proof: Democracy VotingOf (max_values: None, max_size: Some(3799), added: 6274, mode: MaxEncodedLen)
+		// Proof Size summary in bytes:
+		//  Measured:  `1175 + r * (22 ±0)`
+		//  Estimated: `12655`
+		// Minimum execution time: 300_979_000 picoseconds.
+		Weight::from_parts(315_902_954, 0)
+			.saturating_add(Weight::from_parts(0, 12655))
+			// Standard Error: 10_152
+			.saturating_add(Weight::from_parts(156_423, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
+	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
+	/// Storage: Democracy VotingOf (r:1 w:1)
+	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3799), added: 6274, mode: MaxEncodedLen)
+	/// The range of component `r` is `[1, 100]`.
 	fn remove_vote(r: u32, ) -> Weight {
-		Weight::from_ref_time(21_645_506 as u64)
-			// Standard Error: 2_969
-			.saturating_add(Weight::from_ref_time(63_151 as u64).saturating_mul(r as u64))
-			.saturating_add(T::DbWeight::get().reads(2 as u64))
-			.saturating_add(T::DbWeight::get().writes(2 as u64))
-	}
-	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
-	// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
-	// Storage: Democracy VotingOf (r:1 w:1)
-	// Proof: Democracy VotingOf (max_values: None, max_size: Some(3799), added: 6274, mode: MaxEncodedLen)
+		// Proof Size summary in bytes:
+		//  Measured:  `736 + r * (26 ±0)`
+		//  Estimated: `8958`
+		// Minimum execution time: 173_714_000 picoseconds.
+		Weight::from_parts(188_190_880, 0)
+			.saturating_add(Weight::from_parts(0, 8958))
+			// Standard Error: 16_349
+			.saturating_add(Weight::from_parts(316_832, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: Democracy ReferendumInfoOf (r:1 w:1)
+	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
+	/// Storage: Democracy VotingOf (r:1 w:1)
+	/// Proof: Democracy VotingOf (max_values: None, max_size: Some(3799), added: 6274, mode: MaxEncodedLen)
+	/// The range of component `r` is `[1, 100]`.
 	fn remove_other_vote(r: u32, ) -> Weight {
-		Weight::from_ref_time(22_590_899 as u64)
-			// Standard Error: 2_191
-			.saturating_add(Weight::from_ref_time(50_113 as u64).saturating_mul(r as u64))
-			.saturating_add(T::DbWeight::get().reads(2 as u64))
-			.saturating_add(T::DbWeight::get().writes(2 as u64))
+		// Proof Size summary in bytes:
+		//  Measured:  `736 + r * (26 ±0)`
+		//  Estimated: `8958`
+		// Minimum execution time: 172_766_000 picoseconds.
+		Weight::from_parts(191_041_808, 0)
+			.saturating_add(Weight::from_parts(0, 8958))
+			// Standard Error: 6_999
+			.saturating_add(Weight::from_parts(243_399, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: Democracy NextExternal (r:1 w:0)
+	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
+	/// Storage: Preimage StatusFor (r:1 w:0)
+	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:0 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
+	fn set_external_metadata() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `356`
+		//  Estimated: `3193`
+		// Minimum execution time: 243_012_000 picoseconds.
+		Weight::from_parts(248_418_000, 0)
+			.saturating_add(Weight::from_parts(0, 3193))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: Democracy NextExternal (r:1 w:0)
+	/// Proof: Democracy NextExternal (max_values: Some(1), max_size: Some(132), added: 627, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:1 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
+	fn clear_external_metadata() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `219`
+		//  Estimated: `3155`
+		// Minimum execution time: 204_309_000 picoseconds.
+		Weight::from_parts(209_560_000, 0)
+			.saturating_add(Weight::from_parts(0, 3155))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: Democracy PublicProps (r:1 w:0)
+	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
+	/// Storage: Preimage StatusFor (r:1 w:0)
+	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:0 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
+	fn set_proposal_metadata() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `4919`
+		//  Estimated: `19763`
+		// Minimum execution time: 347_393_000 picoseconds.
+		Weight::from_parts(361_504_000, 0)
+			.saturating_add(Weight::from_parts(0, 19763))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: Democracy PublicProps (r:1 w:0)
+	/// Proof: Democracy PublicProps (max_values: Some(1), max_size: Some(16702), added: 17197, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:1 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
+	fn clear_proposal_metadata() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `4786`
+		//  Estimated: `19725`
+		// Minimum execution time: 321_543_000 picoseconds.
+		Weight::from_parts(334_617_000, 0)
+			.saturating_add(Weight::from_parts(0, 19725))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: Preimage StatusFor (r:1 w:0)
+	/// Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:0 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
+	fn set_referendum_metadata() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `211`
+		//  Estimated: `2566`
+		// Minimum execution time: 167_747_000 picoseconds.
+		Weight::from_parts(174_889_000, 0)
+			.saturating_add(Weight::from_parts(0, 2566))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: Democracy ReferendumInfoOf (r:1 w:0)
+	/// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(209), added: 2684, mode: MaxEncodedLen)
+	/// Storage: Democracy MetadataOf (r:1 w:1)
+	/// Proof: Democracy MetadataOf (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
+	fn clear_referendum_metadata() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `239`
+		//  Estimated: `5212`
+		// Minimum execution time: 220_441_000 picoseconds.
+		Weight::from_parts(224_200_000, 0)
+			.saturating_add(Weight::from_parts(0, 5212))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	#[test]
+	fn test_propose() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 23413
+		);
+	}
+	#[test]
+	fn test_second() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 5705
+		);
+	}
+	#[test]
+	fn test_vote_new() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 12732
+		);
+	}
+	#[test]
+	fn test_vote_existing() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 12732
+		);
+	}
+	#[test]
+	fn test_emergency_cancel() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 7720
+		);
+	}
+	#[test]
+	fn test_blacklist() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 39011
+		);
+	}
+	#[test]
+	fn test_external_propose() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 6344
+		);
+	}
+	#[test]
+	fn test_fast_track() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 3654
+		);
+	}
+	#[test]
+	fn test_veto_external() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 8872
+		);
+	}
+	#[test]
+	fn test_cancel_proposal() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 30644
+		);
+	}
+	#[test]
+	fn test_cancel_referendum() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 2528
+		);
+	}
+	#[test]
+	fn test_on_initialize_base() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 998
+		);
+	}
+	#[test]
+	fn test_on_initialize_base_with_launch_period() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 19318
+		);
+	}
+	#[test]
+	fn test_delegate() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 22596
+		);
+	}
+	#[test]
+	fn test_undelegate() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 12548
+		);
+	}
+	#[test]
+	fn test_unlock_remove() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 12655
+		);
+	}
+	#[test]
+	fn test_unlock_set() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 12655
+		);
+	}
+	#[test]
+	fn test_remove_vote() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 8958
+		);
+	}
+	#[test]
+	fn test_remove_other_vote() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 8958
+		);
+	}
+	#[test]
+	fn test_set_external_metadata() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 3193
+		);
+	}
+	#[test]
+	fn test_clear_external_metadata() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 3155
+		);
+	}
+	#[test]
+	fn test_set_proposal_metadata() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 19763
+		);
+	}
+	#[test]
+	fn test_clear_proposal_metadata() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 19725
+		);
+	}
+	#[test]
+	fn test_set_referendum_metadata() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 2566
+		);
+	}
+	#[test]
+	fn test_clear_referendum_metadata() {
+		assert!(
+			<crate::Runtime as frame_system::Config>::BlockWeights::get()
+				.per_class
+				.get(frame_support::dispatch::DispatchClass::Normal)
+				.max_extrinsic
+				.unwrap_or_else(<sp_weights::Weight as sp_runtime::traits::Bounded>::max_value)
+				.proof_size()
+				> 5212
+		);
 	}
 }
diff --git a/runtimes/standalone/Cargo.toml b/runtimes/standalone/Cargo.toml
index 9608cf09b9..2577c17521 100644
--- a/runtimes/standalone/Cargo.toml
+++ b/runtimes/standalone/Cargo.toml
@@ -15,7 +15,7 @@ substrate-wasm-builder.workspace = true
 
 [dependencies]
 # External dependencies
-codec = {package = "parity-scale-codec", workspace = true, features = ["derive"]}
+parity-scale-codec = {workspace = true, features = ["derive"]}
 log.workspace = true
 scale-info = {workspace = true, features = ["derive"]}
 
@@ -49,7 +49,6 @@ pallet-grandpa.workspace = true
 pallet-indices.workspace = true
 pallet-multisig.workspace = true
 pallet-proxy.workspace = true
-pallet-randomness-collective-flip.workspace = true
 pallet-session.workspace = true
 pallet-sudo.workspace = true
 pallet-timestamp.workspace = true
@@ -103,7 +102,7 @@ runtime-benchmarks = [
 std = [
   "frame-benchmarking?/std",
   "attestation/std",
-  "codec/std",
+  "parity-scale-codec/std",
   "ctype/std",
   "delegation/std",
   "did/std",
@@ -125,7 +124,6 @@ std = [
   "pallet-multisig/std",
   "pallet-indices/std",
   "pallet-proxy/std",
-  "pallet-randomness-collective-flip/std",
   "pallet-session/std",
   "pallet-sudo/std",
   "pallet-timestamp/std",
@@ -166,7 +164,6 @@ try-runtime = [
   "pallet-grandpa/try-runtime",
   "pallet-indices/try-runtime",
   "pallet-proxy/try-runtime",
-  "pallet-randomness-collective-flip/try-runtime",
   "pallet-session/try-runtime",
   "pallet-sudo/try-runtime",
   "pallet-timestamp/try-runtime",
diff --git a/runtimes/standalone/src/lib.rs b/runtimes/standalone/src/lib.rs
index 30bb86e7b6..bff6a249fc 100644
--- a/runtimes/standalone/src/lib.rs
+++ b/runtimes/standalone/src/lib.rs
@@ -27,7 +27,6 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
-use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
 	construct_runtime, parameter_types,
 	traits::{Currency, InstanceFilter, KeyOwnerProofSystem},
@@ -35,6 +34,7 @@ use frame_support::{
 };
 pub use frame_system::Call as SystemCall;
 use frame_system::EnsureRoot;
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 
 #[cfg(feature = "try-runtime")]
 use frame_try_runtime::UpgradeCheckSelect;
@@ -491,8 +491,6 @@ impl pallet_utility::Config for Runtime {
 	type WeightInfo = ();
 }
 
-impl pallet_randomness_collective_flip::Config for Runtime {}
-
 impl public_credentials::Config for Runtime {
 	type AccessControl = PalletAuthorize<DelegationAc<Runtime>>;
 	type AttesterId = DidIdentifier;
@@ -686,7 +684,7 @@ construct_runtime!(
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
 		System: frame_system = 0,
-		RandomnessCollectiveFlip: pallet_randomness_collective_flip = 1,
+		// DELETED: RandomnessCollectiveFlip: pallet_insecure_randomness_collective_flip = 1,
 
 		Timestamp: pallet_timestamp = 2,
 		Aura: pallet_aura = 3,
@@ -860,7 +858,7 @@ impl_runtime_apis! {
 
 	impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {
 		fn account_nonce(account: AccountId) -> Index {
-			frame_system::Pallet::<Runtime>::account_nonce(&account)
+			frame_system::Pallet::<Runtime>::account_nonce(account)
 		}
 	}
 
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index f5c70e2874..03db0fbf1b 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2022-10-09"
+channel = "nightly-2023-03-20"
 components = [ "rustfmt", "clippy" ]
 targets = [ "wasm32-unknown-unknown" ]
diff --git a/support/Cargo.toml b/support/Cargo.toml
index 5eefb104fa..bb7fe90158 100644
--- a/support/Cargo.toml
+++ b/support/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 # External dependencies
-codec = {package = "parity-scale-codec", workspace = true, features = ["derive"]}
+parity-scale-codec = {workspace = true, features = ["derive"]}
 scale-info = {workspace = true, features = ["derive"]}
 
 # Substrate dependencies
@@ -37,7 +37,7 @@ runtime-benchmarks = [
   "sp-runtime/runtime-benchmarks",
 ]
 std = [
-  "codec/std",
+  "parity-scale-codec/std",
   "frame-support/std",
   "frame-system/std",
   "scale-info/std",
diff --git a/support/src/deposit.rs b/support/src/deposit.rs
index 2095fc4222..00ad18f04e 100644
--- a/support/src/deposit.rs
+++ b/support/src/deposit.rs
@@ -16,8 +16,8 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::traits::ReservableCurrency;
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::{traits::Zero, DispatchError};
 
diff --git a/support/src/mock.rs b/support/src/mock.rs
index e214cbd866..671a7538a8 100644
--- a/support/src/mock.rs
+++ b/support/src/mock.rs
@@ -17,7 +17,7 @@
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
 ///! This module contains utilities for testing.
-use codec::{Decode, Encode, MaxEncodedLen};
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_core::sr25519;
 use sp_runtime::AccountId32;
@@ -31,8 +31,8 @@ use sp_runtime::AccountId32;
 pub mod mock_origin {
 	use sp_std::marker::PhantomData;
 
-	use codec::{Decode, Encode, MaxEncodedLen};
 	use frame_support::{traits::EnsureOrigin, Parameter};
+	use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 	use scale_info::TypeInfo;
 	use sp_runtime::AccountId32;