diff --git a/.github/actions/build-dependencies/action.yml b/.github/actions/build-dependencies/action.yml
index 4bef8230..345557b9 100644
--- a/.github/actions/build-dependencies/action.yml
+++ b/.github/actions/build-dependencies/action.yml
@@ -15,6 +15,9 @@ inputs:
 runs:
   using: "composite"
   steps:
+    - name: Install Protobuf
+      uses: arduino/setup-protoc@v1
+
     - name: Install solc
       shell: bash
       run: |
diff --git a/Cargo.lock b/Cargo.lock
index 27526429..fdb001ba 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -115,6 +115,12 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "array-bytes"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a913633b0c922e6b745072795f50d90ebea78ba31a57e2ac8c2fc7b50950949"
+
 [[package]]
 name = "array-init"
 version = "2.0.1"
@@ -379,7 +385,7 @@ dependencies = [
  "cfg-if",
  "libc",
  "miniz_oxide",
- "object 0.29.0",
+ "object",
  "rustc-demangle",
 ]
 
@@ -797,12 +803,27 @@ dependencies = [
  "nom",
 ]
 
+[[package]]
+name = "cfg-expr"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db"
+dependencies = [
+ "smallvec",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
 [[package]]
 name = "chacha20"
 version = "0.8.2"
@@ -867,9 +888,9 @@ dependencies = [
 
 [[package]]
 name = "clang-sys"
-version = "1.3.3"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a050e2153c5be08febd6734e29298e844fdb0fa21aeddd63b4eb7baa106c69b"
+checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
 dependencies = [
  "glob",
  "libc",
@@ -1029,13 +1050,13 @@ dependencies = [
 
 [[package]]
 name = "console"
-version = "0.15.1"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89eab4d20ce20cea182308bca13088fecea9c05f6776cf287205d41a0ed3c847"
+checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c"
 dependencies = [
  "encode_unicode",
+ "lazy_static",
  "libc",
- "once_cell",
  "terminal_size",
  "winapi",
 ]
@@ -1103,19 +1124,21 @@ dependencies = [
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.85.3"
+version = "0.88.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "749d0d6022c9038dccf480bdde2a38d435937335bf2bb0f14e815d94517cdce8"
+checksum = "44409ccf2d0f663920cab563d2b79fcd6b2e9a2bcc6e929fef76c8f82ad6c17a"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.85.3"
+version = "0.88.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94370cc7b37bf652ccd8bb8f09bd900997f7ccf97520edfc75554bb5c4abbea"
+checksum = "98de2018ad96eb97f621f7d6b900a0cc661aec8d02ea4a50e56ecb48e5a2fcaf"
 dependencies = [
+ "arrayvec 0.7.2",
+ "bumpalo",
  "cranelift-bforest",
  "cranelift-codegen-meta",
  "cranelift-codegen-shared",
@@ -1130,33 +1153,33 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.85.3"
+version = "0.88.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a3cea8fdab90e44018c5b9a1dfd460d8ee265ac354337150222a354628bdb6"
+checksum = "5287ce36e6c4758fbaf298bd1a8697ad97a4f2375a3d1b61142ea538db4877e5"
 dependencies = [
  "cranelift-codegen-shared",
 ]
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.85.3"
+version = "0.88.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ac72f76f2698598951ab26d8c96eaa854810e693e7dd52523958b5909fde6b2"
+checksum = "2855c24219e2f08827f3f4ffb2da92e134ae8d8ecc185b11ec8f9878cf5f588e"
 
 [[package]]
 name = "cranelift-entity"
-version = "0.85.3"
+version = "0.88.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09eaeacfcd2356fe0e66b295e8f9d59fdd1ac3ace53ba50de14d628ec902f72d"
+checksum = "0b65673279d75d34bf11af9660ae2dbd1c22e6d28f163f5c72f4e1dc56d56103"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.85.3"
+version = "0.88.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dba69c9980d5ffd62c18a2bde927855fcd7c8dc92f29feaf8636052662cbd99c"
+checksum = "3ed2b3d7a4751163f6c4a349205ab1b7d9c00eecf19dcea48592ef1f7688eefc"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -1166,15 +1189,15 @@ dependencies = [
 
 [[package]]
 name = "cranelift-isle"
-version = "0.85.3"
+version = "0.88.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2920dc1e05cac40304456ed3301fde2c09bd6a9b0210bcfa2f101398d628d5b"
+checksum = "3be64cecea9d90105fc6a2ba2d003e98c867c1d6c4c86cc878f97ad9fb916293"
 
 [[package]]
 name = "cranelift-native"
-version = "0.85.3"
+version = "0.88.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04dfa45f9b2a6f587c564d6b63388e00cd6589d2df6ea2758cf79e1a13285e6"
+checksum = "c4a03a6ac1b063e416ca4b93f6247978c991475e8271465340caa6f92f3c16a4"
 dependencies = [
  "cranelift-codegen",
  "libc",
@@ -1183,9 +1206,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-wasm"
-version = "0.85.3"
+version = "0.88.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31a46513ae6f26f3f267d8d75b5373d555fbbd1e68681f348d99df43f747ec54"
+checksum = "c699873f7b30bc5f20dd03a796b4183e073a46616c91704792ec35e45d13f913"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1229,26 +1252,24 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.10"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1"
+checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348"
 dependencies = [
  "autocfg",
  "cfg-if",
  "crossbeam-utils",
  "memoffset",
- "once_cell",
  "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc"
+checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"
 dependencies = [
  "cfg-if",
- "once_cell",
 ]
 
 [[package]]
@@ -1602,9 +1623,9 @@ checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2"
 
 [[package]]
 name = "ecdsa"
-version = "0.14.7"
+version = "0.14.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85789ce7dfbd0f0624c07ef653a08bb2ebf43d3e16531361f46d36dd54334fed"
+checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
 dependencies = [
  "der",
  "elliptic-curve",
@@ -1635,6 +1656,20 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "ed25519-zebra"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "403ef3e961ab98f0ba902771d29f842058578bb1ce7e3c59dad5a6a93e784c69"
+dependencies = [
+ "curve25519-dalek 3.2.0",
+ "hex",
+ "rand_core 0.6.4",
+ "sha2 0.9.9",
+ "thiserror",
+ "zeroize",
+]
+
 [[package]]
 name = "either"
 version = "1.8.0"
@@ -2257,7 +2292,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2274,7 +2309,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2286,6 +2321,7 @@ dependencies = [
  "serde",
  "sp-api",
  "sp-application-crypto",
+ "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-runtime-interface",
@@ -2296,9 +2332,10 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "Inflector",
+ "array-bytes",
  "chrono",
  "clap",
  "comfy-table",
@@ -2308,7 +2345,6 @@ dependencies = [
  "gethostname",
  "handlebars",
  "hash-db",
- "hex",
  "itertools",
  "kvdb",
  "lazy_static",
@@ -2347,7 +2383,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2375,7 +2411,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -2389,6 +2425,7 @@ dependencies = [
  "scale-info",
  "serde",
  "smallvec",
+ "sp-api",
  "sp-arithmetic",
  "sp-core",
  "sp-core-hashing-proc-macro",
@@ -2399,16 +2436,19 @@ dependencies = [
  "sp-state-machine",
  "sp-std",
  "sp-tracing",
+ "sp-weights",
  "tt-call",
 ]
 
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "Inflector",
+ "cfg-expr",
  "frame-support-procedural-tools",
+ "itertools",
  "proc-macro2",
  "quote",
  "syn",
@@ -2417,7 +2457,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -2429,7 +2469,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2439,7 +2479,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "frame-support",
  "log",
@@ -2451,12 +2491,13 @@ dependencies = [
  "sp-runtime",
  "sp-std",
  "sp-version",
+ "sp-weights",
 ]
 
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2471,7 +2512,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2820,15 +2861,6 @@ dependencies = [
  "crunchy",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-dependencies = [
- "ahash",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -3034,14 +3066,13 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.48"
+version = "0.1.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "237a0714f28b1ee39ccec0770ccb544eb02c9ef2c82bb096230eefcffa6468b0"
+checksum = "fd911b35d940d2bd0bea0f9100068e5b97b51a1cbe13d13382f132e0365257a0"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "js-sys",
- "once_cell",
  "wasm-bindgen",
  "winapi",
 ]
@@ -3146,7 +3177,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
 dependencies = [
  "autocfg",
- "hashbrown 0.12.3",
+ "hashbrown",
  "serde",
 ]
 
@@ -3156,7 +3187,7 @@ version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b"
 dependencies = [
- "console 0.15.1",
+ "console 0.15.2",
  "lazy_static",
  "number_prefix",
  "regex",
@@ -3361,12 +3392,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "io-lifetimes"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6"
-
 [[package]]
 name = "io-lifetimes"
 version = "0.7.3"
@@ -3399,9 +3424,9 @@ checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
 
 [[package]]
 name = "itertools"
-version = "0.10.4"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8bf247779e67a9082a4790b45e71ac7cfd1321331a5c856a74a9faebdab78d0"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
 dependencies = [
  "either",
 ]
@@ -3420,9 +3445,9 @@ checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
 
 [[package]]
 name = "jobserver"
-version = "0.1.24"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
+checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
 dependencies = [
  "libc",
 ]
@@ -3438,9 +3463,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11e017217fcd18da0a25296d3693153dd19c8a6aadab330b3595285d075385d1"
+checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a"
 dependencies = [
  "jsonrpsee-core",
  "jsonrpsee-http-server",
@@ -3452,9 +3477,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-core"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16efcd4477de857d4a2195a45769b2fe9ebb54f3ef5a4221d3b014a4fe33ec0b"
+checksum = "f3dc3e9cf2ba50b7b1d7d76a667619f82846caa39e8e8daa8a4962d74acaddca"
 dependencies = [
  "anyhow",
  "arrayvec 0.7.2",
@@ -3463,6 +3488,7 @@ dependencies = [
  "futures-channel",
  "futures-util",
  "globset",
+ "http",
  "hyper",
  "jsonrpsee-types",
  "lazy_static",
@@ -3480,9 +3506,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-http-server"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdd69efeb3ce2cba767f126872f4eeb4624038a29098e75d77608b2b4345ad03"
+checksum = "03802f0373a38c2420c70b5144742d800b509e2937edc4afb116434f07120117"
 dependencies = [
  "futures-channel",
  "futures-util",
@@ -3493,13 +3519,14 @@ dependencies = [
  "serde_json",
  "tokio",
  "tracing",
+ "tracing-futures",
 ]
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "874cf3f6a027cebf36cae767feca9aa2e8a8f799880e49eb5540819fcbd8eada"
+checksum = "bd67957d4280217247588ac86614ead007b301ca2fa9f19c19f880a536f029e3"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -3509,9 +3536,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bcf76cd316f5d3ad48138085af1f45e2c58c98e02f0779783dbb034d43f7c86"
+checksum = "e290bba767401b646812f608c099b922d8142603c9e73a50fb192d3ac86f4a0d"
 dependencies = [
  "anyhow",
  "beef",
@@ -3523,12 +3550,13 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-ws-server"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bd2e4d266774a671f8def3794255b28eddd09b18d76e0b913fa439f34588c0a"
+checksum = "d488ba74fb369e5ab68926feb75a483458b88e768d44319f37e4ecad283c7325"
 dependencies = [
  "futures-channel",
  "futures-util",
+ "http",
  "jsonrpsee-core",
  "jsonrpsee-types",
  "serde_json",
@@ -3537,13 +3565,14 @@ dependencies = [
  "tokio-stream",
  "tokio-util",
  "tracing",
+ "tracing-futures",
 ]
 
 [[package]]
 name = "k256"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3636d281d46c3b64182eb3a0a42b7b483191a2ecc3f05301fa67403f7c9bc949"
+checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
 dependencies = [
  "cfg-if",
  "ecdsa",
@@ -3652,9 +3681,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.132"
+version = "0.2.134"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
+checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb"
 
 [[package]]
 name = "libloading"
@@ -3740,8 +3769,8 @@ dependencies = [
  "libp2p-request-response",
  "libp2p-swarm",
  "log",
- "prost",
- "prost-build",
+ "prost 0.10.4",
+ "prost-build 0.10.4",
  "rand 0.8.5",
 ]
 
@@ -3767,8 +3796,8 @@ dependencies = [
  "multistream-select",
  "parking_lot 0.12.1",
  "pin-project",
- "prost",
- "prost-build",
+ "prost 0.10.4",
+ "prost-build 0.10.4",
  "rand 0.8.5",
  "ring",
  "rw-stream-sink",
@@ -3818,8 +3847,8 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "prost",
- "prost-build",
+ "prost 0.10.4",
+ "prost-build 0.10.4",
  "rand 0.7.3",
  "smallvec",
 ]
@@ -3842,8 +3871,8 @@ dependencies = [
  "libp2p-swarm",
  "log",
  "prometheus-client",
- "prost",
- "prost-build",
+ "prost 0.10.4",
+ "prost-build 0.10.4",
  "rand 0.7.3",
  "regex",
  "sha2 0.10.6",
@@ -3865,8 +3894,8 @@ dependencies = [
  "libp2p-swarm",
  "log",
  "lru",
- "prost",
- "prost-build",
+ "prost 0.10.4",
+ "prost-build 0.10.4",
  "prost-codec",
  "smallvec",
  "thiserror",
@@ -3890,8 +3919,8 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "prost",
- "prost-build",
+ "prost 0.10.4",
+ "prost-build 0.10.4",
  "rand 0.7.3",
  "sha2 0.10.6",
  "smallvec",
@@ -3968,8 +3997,8 @@ dependencies = [
  "lazy_static",
  "libp2p-core",
  "log",
- "prost",
- "prost-build",
+ "prost 0.10.4",
+ "prost-build 0.10.4",
  "rand 0.8.5",
  "sha2 0.10.6",
  "snow",
@@ -4005,8 +4034,8 @@ dependencies = [
  "futures",
  "libp2p-core",
  "log",
- "prost",
- "prost-build",
+ "prost 0.10.4",
+ "prost-build 0.10.4",
  "unsigned-varint",
  "void",
 ]
@@ -4041,8 +4070,8 @@ dependencies = [
  "libp2p-swarm",
  "log",
  "pin-project",
- "prost",
- "prost-build",
+ "prost 0.10.4",
+ "prost-build 0.10.4",
  "prost-codec",
  "rand 0.8.5",
  "smallvec",
@@ -4065,8 +4094,8 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "prost",
- "prost-build",
+ "prost 0.10.4",
+ "prost-build 0.10.4",
  "rand 0.8.5",
  "sha2 0.10.6",
  "thiserror",
@@ -4296,12 +4325,6 @@ dependencies = [
  "statrs",
 ]
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.0.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.0.46"
@@ -4310,9 +4333,9 @@ checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
 
 [[package]]
 name = "lock_api"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390"
+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -4334,7 +4357,7 @@ version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a"
 dependencies = [
- "hashbrown 0.12.3",
+ "hashbrown",
 ]
 
 [[package]]
@@ -4407,9 +4430,9 @@ dependencies = [
 
 [[package]]
 name = "md-5"
-version = "0.10.4"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66b48670c893079d3c2ed79114e3644b7004df1c361a4e0ad52e2e6940d07c3d"
+checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca"
 dependencies = [
  "digest 0.10.5",
 ]
@@ -4422,11 +4445,11 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "memfd"
-version = "0.4.1"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6627dc657574b49d6ad27105ed671822be56e0d2547d413bfbf3e8d8fa92e7a"
+checksum = "480b5a5de855d11ff13195950bdc8b98b5e942ef47afc447f6615cdcc4e15d80"
 dependencies = [
- "libc",
+ "rustix",
 ]
 
 [[package]]
@@ -4454,15 +4477,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6566c70c1016f525ced45d7b7f97730a2bafb037c788211d0c186ef5b2189f0a"
 dependencies = [
  "hash-db",
- "hashbrown 0.12.3",
+ "hashbrown",
  "parity-util-mem",
 ]
 
 [[package]]
 name = "memory_units"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882"
+checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
 
 [[package]]
 name = "merlin"
@@ -4615,12 +4638,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "more-asserts"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389"
-
 [[package]]
 name = "multiaddr"
 version = "0.14.0"
@@ -4723,7 +4740,7 @@ dependencies = [
  "matrixmultiply",
  "nalgebra-macros",
  "num-complex",
- "num-rational 0.4.1",
+ "num-rational",
  "num-traits",
  "rand 0.8.5",
  "rand_distr",
@@ -4876,9 +4893,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.2.6"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
+checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -4914,18 +4931,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "num-rational"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
-dependencies = [
- "autocfg",
- "num-bigint",
- "num-integer",
- "num-traits",
-]
-
 [[package]]
 name = "num-rational"
 version = "0.4.1"
@@ -4933,6 +4938,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
 dependencies = [
  "autocfg",
+ "num-bigint",
  "num-integer",
  "num-traits",
 ]
@@ -4974,30 +4980,21 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "object"
-version = "0.28.4"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
+checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
 dependencies = [
  "crc32fast",
- "hashbrown 0.11.2",
+ "hashbrown",
  "indexmap",
  "memchr",
 ]
 
-[[package]]
-name = "object"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "once_cell"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0"
+checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
 
 [[package]]
 name = "opaque-debug"
@@ -5013,9 +5010,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.41"
+version = "0.10.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0"
+checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -5045,9 +5042,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.75"
+version = "0.9.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f"
+checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce"
 dependencies = [
  "autocfg",
  "cc",
@@ -5085,7 +5082,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5100,7 +5097,7 @@ dependencies = [
 [[package]]
 name = "pallet-contracts"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "bitflags",
  "frame-benchmarking",
@@ -5127,7 +5124,7 @@ dependencies = [
 [[package]]
 name = "pallet-contracts-primitives"
 version = "6.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "bitflags",
  "parity-scale-codec",
@@ -5142,7 +5139,7 @@ dependencies = [
 [[package]]
 name = "pallet-contracts-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5152,7 +5149,7 @@ dependencies = [
 [[package]]
 name = "pallet-contracts-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "jsonrpsee",
  "pallet-contracts-primitives",
@@ -5169,7 +5166,7 @@ dependencies = [
 [[package]]
 name = "pallet-contracts-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "pallet-contracts-primitives",
  "parity-scale-codec",
@@ -5182,7 +5179,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5196,7 +5193,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5214,7 +5211,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5230,7 +5227,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
@@ -5245,7 +5242,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -5281,6 +5278,7 @@ dependencies = [
  "arrayvec 0.7.2",
  "bitvec 1.0.1",
  "byte-slice-cast",
+ "bytes",
  "impl-trait-for-tuples",
  "parity-scale-codec-derive",
  "serde",
@@ -5311,7 +5309,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f"
 dependencies = [
  "cfg-if",
- "hashbrown 0.12.3",
+ "hashbrown",
  "impl-trait-for-tuples",
  "parity-util-mem-derive",
  "parking_lot 0.12.1",
@@ -5342,9 +5340,9 @@ dependencies = [
 
 [[package]]
 name = "parity-wasm"
-version = "0.42.2"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92"
+checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304"
 
 [[package]]
 name = "parking"
@@ -5765,9 +5763,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.43"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
+checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b"
 dependencies = [
  "unicode-ident",
 ]
@@ -5816,7 +5814,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e"
 dependencies = [
  "bytes",
- "prost-derive",
+ "prost-derive 0.10.1",
+]
+
+[[package]]
+name = "prost"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7"
+dependencies = [
+ "bytes",
+ "prost-derive 0.11.0",
 ]
 
 [[package]]
@@ -5834,8 +5842,28 @@ dependencies = [
  "log",
  "multimap",
  "petgraph",
- "prost",
- "prost-types",
+ "prost 0.10.4",
+ "prost-types 0.10.1",
+ "regex",
+ "tempfile",
+ "which",
+]
+
+[[package]]
+name = "prost-build"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f835c582e6bd972ba8347313300219fed5bfa52caf175298d860b61ff6069bb"
+dependencies = [
+ "bytes",
+ "heck",
+ "itertools",
+ "lazy_static",
+ "log",
+ "multimap",
+ "petgraph",
+ "prost 0.11.0",
+ "prost-types 0.11.1",
  "regex",
  "tempfile",
  "which",
@@ -5849,7 +5877,7 @@ checksum = "00af1e92c33b4813cc79fda3f2dbf56af5169709be0202df730e9ebc3e4cd007"
 dependencies = [
  "asynchronous-codec",
  "bytes",
- "prost",
+ "prost 0.10.4",
  "thiserror",
  "unsigned-varint",
 ]
@@ -5867,6 +5895,19 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "prost-derive"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364"
+dependencies = [
+ "anyhow",
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "prost-types"
 version = "0.10.1"
@@ -5874,14 +5915,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68"
 dependencies = [
  "bytes",
- "prost",
+ "prost 0.10.4",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dfaa718ad76a44b3415e6c4d53b17c8f99160dcb3a99b10470fce8ad43f6e3e"
+dependencies = [
+ "bytes",
+ "prost 0.11.0",
 ]
 
 [[package]]
 name = "psm"
-version = "0.1.20"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f446d0a6efba22928558c4fb4ce0b3fd6c89b0061343e390bf01a703742b8125"
+checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
 dependencies = [
  "cc",
 ]
@@ -6096,9 +6147,9 @@ dependencies = [
 
 [[package]]
 name = "regalloc2"
-version = "0.2.3"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a8d23b35d7177df3b9d31ed8a9ab4bf625c668be77a319d4f5efd4a5257701c"
+checksum = "d43a209257d978ef079f3d446331d0f1794f5e0fc19b306a199983857833a779"
 dependencies = [
  "fxhash",
  "log",
@@ -6132,18 +6183,6 @@ version = "0.6.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
 
-[[package]]
-name = "region"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877e54ea2adcd70d80e9179344c97f93ef0dffd6b03e1f4529e6e83ab2fa9ae0"
-dependencies = [
- "bitflags",
- "libc",
- "mach",
- "winapi",
-]
-
 [[package]]
 name = "remove_dir_all"
 version = "0.5.3"
@@ -6155,9 +6194,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.11"
+version = "0.11.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92"
+checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc"
 dependencies = [
  "base64 0.13.0",
  "bytes",
@@ -6172,10 +6211,10 @@ dependencies = [
  "hyper-tls",
  "ipnet",
  "js-sys",
- "lazy_static",
  "log",
  "mime",
  "native-tls",
+ "once_cell",
  "percent-encoding",
  "pin-project-lite 0.2.9",
  "rustls",
@@ -6205,12 +6244,6 @@ dependencies = [
  "quick-error",
 ]
 
-[[package]]
-name = "retain_mut"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0"
-
 [[package]]
 name = "rfc6979"
 version = "0.3.0"
@@ -6239,9 +6272,9 @@ dependencies = [
 
 [[package]]
 name = "ripemd"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74e2ee464e763f6527991a6d532142e3c2016eb9907cc081401c11862c26a840"
+checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
 dependencies = [
  "digest 0.10.5",
 ]
@@ -6285,9 +6318,9 @@ dependencies = [
 
 [[package]]
 name = "rpassword"
-version = "5.0.1"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb"
+checksum = "26b763cb66df1c928432cc35053f8bd4cec3335d8559fc16010017d16b3c1680"
 dependencies = [
  "libc",
  "winapi",
@@ -6357,29 +6390,15 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.33.7"
+version = "0.35.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0"
+checksum = "fbb2fda4666def1433b1b05431ab402e42a1084285477222b72d6c564c417cef"
 dependencies = [
  "bitflags",
  "errno",
- "io-lifetimes 0.5.3",
+ "io-lifetimes",
  "libc",
- "linux-raw-sys 0.0.42",
- "winapi",
-]
-
-[[package]]
-name = "rustix"
-version = "0.35.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72c825b8aa8010eb9ee99b75f05e10180b9278d161583034d7574c9d617aeada"
-dependencies = [
- "bitflags",
- "errno",
- "io-lifetimes 0.7.3",
- "libc",
- "linux-raw-sys 0.0.46",
+ "linux-raw-sys",
  "windows-sys",
 ]
 
@@ -6469,7 +6488,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.1.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "log",
  "sp-core",
@@ -6480,7 +6499,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "futures",
  "futures-timer",
@@ -6503,7 +6522,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -6519,13 +6538,13 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "impl-trait-for-tuples",
  "memmap2",
  "parity-scale-codec",
  "sc-chain-spec-derive",
- "sc-network",
+ "sc-network-common",
  "sc-telemetry",
  "serde",
  "serde_json",
@@ -6536,7 +6555,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -6547,13 +6566,13 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
+ "array-bytes",
  "chrono",
  "clap",
  "fdlimit",
  "futures",
- "hex",
  "libp2p",
  "log",
  "names",
@@ -6565,6 +6584,7 @@ dependencies = [
  "sc-client-db",
  "sc-keystore",
  "sc-network",
+ "sc-network-common",
  "sc-service",
  "sc-telemetry",
  "sc-tracing",
@@ -6586,7 +6606,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "fnv",
  "futures",
@@ -6614,7 +6634,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -6639,7 +6659,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "async-trait",
  "futures",
@@ -6663,7 +6683,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-pow"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "async-trait",
  "futures",
@@ -6688,7 +6708,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "lazy_static",
  "lru",
@@ -6715,14 +6735,13 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "environmental",
  "parity-scale-codec",
  "sc-allocator",
  "sp-maybe-compressed-blob",
  "sp-sandbox",
- "sp-serializer",
  "sp-wasm-interface",
  "thiserror",
  "wasm-instrument",
@@ -6732,7 +6751,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -6747,15 +6766,15 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "cfg-if",
  "libc",
  "log",
  "once_cell",
  "parity-scale-codec",
- "parity-wasm 0.42.2",
- "rustix 0.35.9",
+ "parity-wasm 0.45.0",
+ "rustix",
  "sc-allocator",
  "sc-executor-common",
  "sp-runtime-interface",
@@ -6767,7 +6786,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "ansi_term",
  "futures",
@@ -6775,7 +6794,7 @@ dependencies = [
  "log",
  "parity-util-mem",
  "sc-client-api",
- "sc-network",
+ "sc-network-common",
  "sc-transaction-pool-api",
  "sp-blockchain",
  "sp-runtime",
@@ -6784,10 +6803,10 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
+ "array-bytes",
  "async-trait",
- "hex",
  "parking_lot 0.12.1",
  "serde_json",
  "sp-application-crypto",
@@ -6799,8 +6818,9 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
+ "array-bytes",
  "async-trait",
  "asynchronous-codec",
  "bitflags",
@@ -6811,7 +6831,6 @@ dependencies = [
  "fork-tree",
  "futures",
  "futures-timer",
- "hex",
  "ip_network",
  "libp2p",
  "linked-hash-map",
@@ -6821,8 +6840,7 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "pin-project",
- "prost",
- "prost-build",
+ "prost 0.10.4",
  "rand 0.7.3",
  "sc-block-builder",
  "sc-client-api",
@@ -6841,39 +6859,67 @@ dependencies = [
  "substrate-prometheus-endpoint",
  "thiserror",
  "unsigned-varint",
- "void",
  "zeroize",
 ]
 
+[[package]]
+name = "sc-network-bitswap"
+version = "0.10.0-dev"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
+dependencies = [
+ "cid",
+ "futures",
+ "libp2p",
+ "log",
+ "prost 0.11.0",
+ "prost-build 0.11.1",
+ "sc-client-api",
+ "sc-network-common",
+ "sp-blockchain",
+ "sp-runtime",
+ "thiserror",
+ "unsigned-varint",
+ "void",
+]
+
 [[package]]
 name = "sc-network-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
+ "async-trait",
  "bitflags",
+ "bytes",
  "futures",
+ "futures-timer",
  "libp2p",
+ "linked_hash_set",
  "parity-scale-codec",
- "prost-build",
+ "prost-build 0.10.4",
  "sc-consensus",
  "sc-peerset",
+ "serde",
  "smallvec",
+ "sp-blockchain",
  "sp-consensus",
  "sp-finality-grandpa",
  "sp-runtime",
+ "substrate-prometheus-endpoint",
+ "thiserror",
 ]
 
 [[package]]
 name = "sc-network-light"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
+ "array-bytes",
  "futures",
  "libp2p",
  "log",
  "parity-scale-codec",
- "prost",
- "prost-build",
+ "prost 0.10.4",
+ "prost-build 0.10.4",
  "sc-client-api",
  "sc-network-common",
  "sc-peerset",
@@ -6886,16 +6932,17 @@ dependencies = [
 [[package]]
 name = "sc-network-sync"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
+ "array-bytes",
  "fork-tree",
  "futures",
  "libp2p",
  "log",
  "lru",
  "parity-scale-codec",
- "prost",
- "prost-build",
+ "prost 0.10.4",
+ "prost-build 0.10.4",
  "sc-client-api",
  "sc-consensus",
  "sc-network-common",
@@ -6910,25 +6957,46 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "sc-network-transactions"
+version = "0.10.0-dev"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
+dependencies = [
+ "array-bytes",
+ "futures",
+ "hex",
+ "libp2p",
+ "log",
+ "parity-scale-codec",
+ "pin-project",
+ "sc-network-common",
+ "sc-peerset",
+ "sp-consensus",
+ "sp-runtime",
+ "substrate-prometheus-endpoint",
+]
+
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
+ "array-bytes",
  "bytes",
  "fnv",
  "futures",
  "futures-timer",
- "hex",
  "hyper",
  "hyper-rustls",
+ "libp2p",
  "num_cpus",
  "once_cell",
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "rand 0.7.3",
  "sc-client-api",
- "sc-network",
+ "sc-network-common",
+ "sc-peerset",
  "sc-utils",
  "sp-api",
  "sp-core",
@@ -6941,7 +7009,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "futures",
  "libp2p",
@@ -6954,7 +7022,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -6963,7 +7031,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "futures",
  "hash-db",
@@ -6993,7 +7061,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -7016,7 +7084,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -7029,7 +7097,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "async-trait",
  "directories",
@@ -7053,9 +7121,11 @@ dependencies = [
  "sc-informant",
  "sc-keystore",
  "sc-network",
+ "sc-network-bitswap",
  "sc-network-common",
  "sc-network-light",
  "sc-network-sync",
+ "sc-network-transactions",
  "sc-offchain",
  "sc-rpc",
  "sc-rpc-server",
@@ -7085,6 +7155,7 @@ dependencies = [
  "sp-transaction-storage-proof",
  "sp-trie",
  "sp-version",
+ "static_init",
  "substrate-prometheus-endpoint",
  "tempfile",
  "thiserror",
@@ -7096,7 +7167,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7110,7 +7181,7 @@ dependencies = [
 [[package]]
 name = "sc-sysinfo"
 version = "6.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "futures",
  "libc",
@@ -7129,7 +7200,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "chrono",
  "futures",
@@ -7147,7 +7218,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "ansi_term",
  "atty",
@@ -7178,7 +7249,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -7189,7 +7260,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "futures",
  "futures-timer",
@@ -7198,7 +7269,6 @@ dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
  "parking_lot 0.12.1",
- "retain_mut",
  "sc-client-api",
  "sc-transaction-pool-api",
  "sc-utils",
@@ -7216,7 +7286,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "futures",
  "log",
@@ -7229,7 +7299,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "futures",
  "futures-timer",
@@ -7569,9 +7639,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.144"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
+checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
 dependencies = [
  "serde_derive",
 ]
@@ -7588,9 +7658,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.144"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
+checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7859,7 +7929,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "hash-db",
  "log",
@@ -7869,6 +7939,7 @@ dependencies = [
  "sp-runtime",
  "sp-state-machine",
  "sp-std",
+ "sp-trie",
  "sp-version",
  "thiserror",
 ]
@@ -7876,7 +7947,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "blake2",
  "proc-macro-crate",
@@ -7888,7 +7959,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "6.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -7901,7 +7972,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "5.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -7916,7 +7987,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7928,7 +7999,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "futures",
  "log",
@@ -7946,7 +8017,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "async-trait",
  "futures",
@@ -7965,7 +8036,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-pow"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7977,18 +8048,18 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "6.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
+ "array-bytes",
  "base58 0.2.0",
  "bitflags",
- "blake2-rfc",
+ "blake2",
  "byteorder",
  "dyn-clonable",
- "ed25519-dalek",
+ "ed25519-zebra",
  "futures",
  "hash-db",
  "hash256-std-hasher",
- "hex",
  "impl-serde",
  "lazy_static",
  "libsecp256k1",
@@ -8023,7 +8094,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing"
 version = "4.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "blake2",
  "byteorder",
@@ -8037,7 +8108,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8048,7 +8119,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.1",
@@ -8057,7 +8128,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "4.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8067,7 +8138,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.12.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8078,7 +8149,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -8096,7 +8167,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -8110,8 +8181,9 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "6.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
+ "bytes",
  "futures",
  "hash-db",
  "libsecp256k1",
@@ -8135,7 +8207,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "6.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -8146,7 +8218,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.12.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "async-trait",
  "futures",
@@ -8163,7 +8235,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "thiserror",
  "zstd",
@@ -8172,7 +8244,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -8182,7 +8254,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "4.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -8192,7 +8264,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "6.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -8202,7 +8274,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "6.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -8219,13 +8291,15 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-std",
+ "sp-weights",
 ]
 
 [[package]]
 name = "sp-runtime-interface"
 version = "6.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
+ "bytes",
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "primitive-types",
@@ -8241,7 +8315,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -8253,7 +8327,7 @@ dependencies = [
 [[package]]
 name = "sp-sandbox"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8264,19 +8338,10 @@ dependencies = [
  "wasmi",
 ]
 
-[[package]]
-name = "sp-serializer"
-version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
-dependencies = [
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -8290,7 +8355,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -8301,7 +8366,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.12.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "hash-db",
  "log",
@@ -8323,12 +8388,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "4.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 
 [[package]]
 name = "sp-storage"
 version = "6.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8341,7 +8406,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "log",
  "sp-core",
@@ -8354,7 +8419,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "async-trait",
  "futures-timer",
@@ -8370,7 +8435,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "5.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -8382,7 +8447,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -8391,7 +8456,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "async-trait",
  "log",
@@ -8407,15 +8472,22 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "6.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
+ "ahash",
  "hash-db",
+ "hashbrown",
+ "lazy_static",
+ "lru",
  "memory-db",
+ "nohash-hasher",
  "parity-scale-codec",
+ "parking_lot 0.12.1",
  "scale-info",
  "sp-core",
  "sp-std",
  "thiserror",
+ "tracing",
  "trie-db",
  "trie-root",
 ]
@@ -8423,11 +8495,11 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "5.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
- "parity-wasm 0.42.2",
+ "parity-wasm 0.45.0",
  "scale-info",
  "serde",
  "sp-core-hashing-proc-macro",
@@ -8440,7 +8512,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -8451,7 +8523,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "6.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "impl-trait-for-tuples",
  "log",
@@ -8461,6 +8533,22 @@ dependencies = [
  "wasmtime",
 ]
 
+[[package]]
+name = "sp-weights"
+version = "4.0.0"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
+dependencies = [
+ "impl-trait-for-tuples",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "smallvec",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-debug-derive",
+ "sp-std",
+]
+
 [[package]]
 name = "spin"
 version = "0.5.2"
@@ -8479,9 +8567,9 @@ dependencies = [
 
 [[package]]
 name = "ss58-registry"
-version = "1.29.0"
+version = "1.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0837b5d62f42082c9d56cd946495ae273a3c68083b637b9153341d5e465146d"
+checksum = "5e4f0cb475a8e58d9ed8a963010108768d79e397f7aff79f9a3972ef490f97de"
 dependencies = [
  "Inflector",
  "num-format",
@@ -8504,6 +8592,34 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
+[[package]]
+name = "static_init"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6"
+dependencies = [
+ "bitflags",
+ "cfg_aliases",
+ "libc",
+ "parking_lot 0.11.2",
+ "parking_lot_core 0.8.5",
+ "static_init_macro",
+ "winapi",
+]
+
+[[package]]
+name = "static_init_macro"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70a2595fc3aa78f2d0e45dd425b22282dd863273761cc77780914b2cf3003acf"
+dependencies = [
+ "cfg_aliases",
+ "memchr",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "statrs"
 version = "0.15.0"
@@ -8574,7 +8690,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "platforms",
 ]
@@ -8582,7 +8698,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures",
@@ -8603,7 +8719,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "futures-util",
  "hyper",
@@ -8616,7 +8732,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/serai-dex/substrate#c352f3530b6ea7ebc88d034b56dfc7a4f441f3a2"
+source = "git+https://github.com/serai-dex/substrate#201ce645a742f02d79bfe6ac7d783b1dfe043ab1"
 dependencies = [
  "ansi_term",
  "build-helper",
@@ -8669,9 +8785,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.99"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
+checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8775,18 +8891,18 @@ checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
 
 [[package]]
 name = "thiserror"
-version = "1.0.35"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c53f98874615aea268107765aa1ed8f6116782501d18e53d08b471733bea6c85"
+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.35"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8b463991b4eab2d801e724172285ec4195c650e8ec79b149e6c2a8e6dd3f783"
+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8902,9 +9018,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.21.1"
+version = "1.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0020c875007ad96677dcc890298f4b942882c5d4eb7cc8f439fc3bf813dc9c95"
+checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099"
 dependencies = [
  "autocfg",
  "bytes",
@@ -8912,7 +9028,6 @@ dependencies = [
  "memchr",
  "mio",
  "num_cpus",
- "once_cell",
  "parking_lot 0.12.1",
  "pin-project-lite 0.2.9",
  "signal-hook-registry",
@@ -9083,12 +9198,12 @@ dependencies = [
 
 [[package]]
 name = "trie-db"
-version = "0.23.1"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32d034c0d3db64b43c31de38e945f15b40cd4ca6d2dcfc26d4798ce8de4ab83"
+checksum = "004e1e8f92535694b4cb1444dc5a8073ecf0815e3357f729638b9f8fc4062908"
 dependencies = [
  "hash-db",
- "hashbrown 0.12.3",
+ "hashbrown",
  "log",
  "rustc-hex",
  "smallvec",
@@ -9184,9 +9299,9 @@ checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
 
 [[package]]
 name = "uint"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0"
+checksum = "a45526d29728d135c2900b0d30573fe3ee79fceb12ef534c7bb30e810a91b601"
 dependencies = [
  "byteorder",
  "crunchy",
@@ -9443,11 +9558,11 @@ dependencies = [
 
 [[package]]
 name = "wasm-instrument"
-version = "0.1.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "962e5b0401bbb6c887f54e69b8c496ea36f704df65db73e81fd5ff8dc3e63a9f"
+checksum = "aa1dafb3e60065305741e83db35c6c2584bb3725b692b5b66148a38d72ace6cd"
 dependencies = [
- "parity-wasm 0.42.2",
+ "parity-wasm 0.45.0",
 ]
 
 [[package]]
@@ -9467,58 +9582,63 @@ dependencies = [
 
 [[package]]
 name = "wasmi"
-version = "0.9.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca00c5147c319a8ec91ec1a0edbec31e566ce2c9cc93b3f9bb86a9efd0eb795d"
+checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422"
 dependencies = [
- "downcast-rs",
- "libc",
- "libm",
- "memory_units",
- "num-rational 0.2.4",
- "num-traits",
- "parity-wasm 0.42.2",
+ "parity-wasm 0.45.0",
  "wasmi-validation",
+ "wasmi_core",
 ]
 
 [[package]]
 name = "wasmi-validation"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "165343ecd6c018fc09ebcae280752702c9a2ef3e6f8d02f1cfcbdb53ef6d7937"
+checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b"
 dependencies = [
- "parity-wasm 0.42.2",
+ "parity-wasm 0.45.0",
+]
+
+[[package]]
+name = "wasmi_core"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7"
+dependencies = [
+ "downcast-rs",
+ "libm",
+ "memory_units",
+ "num-rational",
+ "num-traits",
 ]
 
 [[package]]
 name = "wasmparser"
-version = "0.85.0"
+version = "0.89.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "570460c58b21e9150d2df0eaaedbb7816c34bcec009ae0dcc976e40ba81463e7"
+checksum = "ab5d3e08b13876f96dd55608d03cd4883a0545884932d5adf11925876c96daef"
 dependencies = [
  "indexmap",
 ]
 
 [[package]]
 name = "wasmtime"
-version = "0.38.3"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f50eadf868ab6a04b7b511460233377d0bfbb92e417b2f6a98b98fef2e098f5"
+checksum = "f1f511c4917c83d04da68333921107db75747c4e11a2f654a8e909cc5e0520dc"
 dependencies = [
  "anyhow",
- "backtrace",
  "bincode",
  "cfg-if",
  "indexmap",
- "lazy_static",
  "libc",
  "log",
- "object 0.28.4",
+ "object",
  "once_cell",
  "paste",
  "psm",
  "rayon",
- "region",
  "serde",
  "target-lexicon",
  "wasmparser",
@@ -9527,14 +9647,23 @@ dependencies = [
  "wasmtime-environ",
  "wasmtime-jit",
  "wasmtime-runtime",
- "winapi",
+ "windows-sys",
+]
+
+[[package]]
+name = "wasmtime-asm-macros"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39bf3debfe744bf19dd3732990ce6f8c0ced7439e2370ba4e1d8f5a3660a3178"
+dependencies = [
+ "cfg-if",
 ]
 
 [[package]]
 name = "wasmtime-cache"
-version = "0.38.3"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1df23c642e1376892f3b72f311596976979cbf8b85469680cdd3a8a063d12a2"
+checksum = "ece42fa4676a263f7558cdaaf5a71c2592bebcbac22a0580e33cf3406c103da2"
 dependencies = [
  "anyhow",
  "base64 0.13.0",
@@ -9542,19 +9671,19 @@ dependencies = [
  "directories-next",
  "file-per-thread-logger",
  "log",
- "rustix 0.33.7",
+ "rustix",
  "serde",
  "sha2 0.9.9",
  "toml",
- "winapi",
+ "windows-sys",
  "zstd",
 ]
 
 [[package]]
 name = "wasmtime-cranelift"
-version = "0.38.3"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f264ff6b4df247d15584f2f53d009fbc90032cfdc2605b52b961bffc71b6eccd"
+checksum = "058217e28644b012bdcdf0e445f58d496d78c2e0b6a6dd93558e701591dad705"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -9564,8 +9693,7 @@ dependencies = [
  "cranelift-wasm",
  "gimli",
  "log",
- "more-asserts",
- "object 0.28.4",
+ "object",
  "target-lexicon",
  "thiserror",
  "wasmparser",
@@ -9574,17 +9702,16 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-environ"
-version = "0.38.3"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "839d2820e4b830f4b9e7aa08d4c0acabf4a5036105d639f6dfa1c6891c73bdc6"
+checksum = "c7af06848df28b7661471d9a80d30a973e0f401f2e3ed5396ad7e225ed217047"
 dependencies = [
  "anyhow",
  "cranelift-entity",
  "gimli",
  "indexmap",
  "log",
- "more-asserts",
- "object 0.28.4",
+ "object",
  "serde",
  "target-lexicon",
  "thiserror",
@@ -9594,9 +9721,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-jit"
-version = "0.38.3"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef0a0bcbfa18b946d890078ba0e1bc76bcc53eccfb40806c0020ec29dcd1bd49"
+checksum = "9028fb63a54185b3c192b7500ef8039c7bb8d7f62bfc9e7c258483a33a3d13bb"
 dependencies = [
  "addr2line",
  "anyhow",
@@ -9605,38 +9732,36 @@ dependencies = [
  "cpp_demangle",
  "gimli",
  "log",
- "object 0.28.4",
- "region",
+ "object",
  "rustc-demangle",
- "rustix 0.33.7",
+ "rustix",
  "serde",
  "target-lexicon",
  "thiserror",
  "wasmtime-environ",
  "wasmtime-jit-debug",
  "wasmtime-runtime",
- "winapi",
+ "windows-sys",
 ]
 
 [[package]]
 name = "wasmtime-jit-debug"
-version = "0.38.3"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f4779d976206c458edd643d1ac622b6c37e4a0800a8b1d25dfbf245ac2f2cac"
+checksum = "25e82d4ef93296785de7efca92f7679dc67fe68a13b625a5ecc8d7503b377a37"
 dependencies = [
- "lazy_static",
- "object 0.28.4",
- "rustix 0.33.7",
+ "object",
+ "once_cell",
+ "rustix",
 ]
 
 [[package]]
 name = "wasmtime-runtime"
-version = "0.38.3"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7eb6ffa169eb5dcd18ac9473c817358cd57bc62c244622210566d473397954a"
+checksum = "9f0e9bea7d517d114fe66b930b2124ee086516ee93eeebfd97f75f366c5b0553"
 dependencies = [
  "anyhow",
- "backtrace",
  "cc",
  "cfg-if",
  "indexmap",
@@ -9645,21 +9770,21 @@ dependencies = [
  "mach",
  "memfd",
  "memoffset",
- "more-asserts",
+ "paste",
  "rand 0.8.5",
- "region",
- "rustix 0.33.7",
+ "rustix",
  "thiserror",
+ "wasmtime-asm-macros",
  "wasmtime-environ",
  "wasmtime-jit-debug",
- "winapi",
+ "windows-sys",
 ]
 
 [[package]]
 name = "wasmtime-types"
-version = "0.38.3"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d932b0ac5336f7308d869703dd225610a6a3aeaa8e968c52b43eed96cefb1c2"
+checksum = "69b83e93ed41b8fdc936244cfd5e455480cf1eca1fd60c78a0040038b4ce5075"
 dependencies = [
  "cranelift-entity",
  "serde",
@@ -9689,9 +9814,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.22.4"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf"
+checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be"
 dependencies = [
  "webpki",
 ]
diff --git a/docs/Getting Started.md b/docs/Getting Started.md
index b07f061c..2f8d6ba7 100644
--- a/docs/Getting Started.md	
+++ b/docs/Getting Started.md	
@@ -5,7 +5,7 @@
 ##### Ubuntu
 
 ```
-sudo apt-get install -y build-essential cmake clang-11 git curl python3-pip
+sudo apt-get install -y build-essential cmake clang-11 git curl python3-pip protobuf-compiler
 ```
 
 ### Install rustup
diff --git a/substrate/consensus/src/lib.rs b/substrate/consensus/src/lib.rs
index 99a35034..763e6ff4 100644
--- a/substrate/consensus/src/lib.rs
+++ b/substrate/consensus/src/lib.rs
@@ -3,7 +3,6 @@ use std::{marker::Sync, sync::Arc, time::Duration};
 use substrate_prometheus_endpoint::Registry;
 
 use sc_consensus_pow as sc_pow;
-use sc_client_api::call_executor::ExecutorProvider;
 use sc_executor::NativeElseWasmExecutor;
 use sc_service::TaskManager;
 
@@ -40,12 +39,11 @@ pub fn import_queue<S: sp_consensus::SelectChain<Block> + 'static>(
 ) -> Result<sc_pow::PowImportQueue<Block, Db>, sp_consensus::Error> {
   let pow_block_import = Box::new(sc_pow::PowBlockImport::new(
     client.clone(),
-    client.clone(),
+    client,
     algorithm::AcceptAny,
     0,
     select_chain,
     |_, _| async { Ok(sp_timestamp::InherentDataProvider::from_system_time()) },
-    sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
   ));
 
   sc_pow::import_queue(
@@ -97,8 +95,6 @@ pub fn authority<S: sp_consensus::SelectChain<Block> + 'static>(
     None,
   );
 
-  let can_author_with = sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone());
-
   let pow_block_import = Box::new(sc_pow::PowBlockImport::new(
     client.clone(),
     client.clone(),
@@ -106,7 +102,6 @@ pub fn authority<S: sp_consensus::SelectChain<Block> + 'static>(
     0, // Block to start checking inherents at
     select_chain.clone(),
     move |_, _| async { Ok(sp_timestamp::InherentDataProvider::from_system_time()) },
-    sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
   ));
 
   let (worker, worker_task) = sc_pow::start_mining_worker(
@@ -121,7 +116,6 @@ pub fn authority<S: sp_consensus::SelectChain<Block> + 'static>(
     move |_, _| async { Ok(sp_timestamp::InherentDataProvider::from_system_time()) },
     Duration::from_secs(6),
     Duration::from_secs(2),
-    can_author_with,
   );
 
   task_manager.spawn_essential_handle().spawn_blocking("pow", None, worker_task);
diff --git a/substrate/node/Cargo.toml b/substrate/node/Cargo.toml
index 71cbb8c8..cc0d2a09 100644
--- a/substrate/node/Cargo.toml
+++ b/substrate/node/Cargo.toml
@@ -31,7 +31,7 @@ frame-system = { git = "https://github.com/serai-dex/substrate" }
 pallet-transaction-payment = { git = "https://github.com/serai-dex/substrate", default-features = false }
 
 # These dependencies are used for the node template's RPCs
-jsonrpsee = { version = "0.14.0", features = ["server"] }
+jsonrpsee = { version = "0.15.1", features = ["server"] }
 sc-rpc = { git = "https://github.com/serai-dex/substrate" }
 sp-api = { git = "https://github.com/serai-dex/substrate" }
 sc-rpc-api = { git = "https://github.com/serai-dex/substrate" }
@@ -54,4 +54,8 @@ substrate-build-script-utils = { git = "https://github.com/serai-dex/substrate.g
 
 [features]
 default = []
-runtime-benchmarks = ["serai-runtime/runtime-benchmarks"]
+runtime-benchmarks = [
+  "frame-benchmarking/runtime-benchmarks",
+  "frame-benchmarking-cli/runtime-benchmarks",
+  "serai-runtime/runtime-benchmarks"
+]
diff --git a/substrate/node/src/command.rs b/substrate/node/src/command.rs
index 3f0ced14..c313d1a5 100644
--- a/substrate/node/src/command.rs
+++ b/substrate/node/src/command.rs
@@ -94,6 +94,12 @@ pub fn run() -> sc_cli::Result<()> {
 
       BenchmarkCmd::Block(cmd) => cmd.run(service::new_partial(&config)?.client),
 
+      #[cfg(not(feature = "runtime-benchmarks"))]
+      BenchmarkCmd::Storage(_) => {
+        Err("Storage benchmarking can be enabled with `--features runtime-benchmarks`.".into())
+      }
+
+      #[cfg(feature = "runtime-benchmarks")]
       BenchmarkCmd::Storage(cmd) => {
         let PartialComponents { client, backend, .. } = service::new_partial(&config)?;
         cmd.run(config, client, backend.expose_db(), backend.expose_storage())
@@ -101,7 +107,13 @@ pub fn run() -> sc_cli::Result<()> {
 
       BenchmarkCmd::Overhead(cmd) => {
         let client = service::new_partial(&config)?.client;
-        cmd.run(config, client.clone(), inherent_benchmark_data()?, &RemarkBuilder::new(client))
+        cmd.run(
+          config,
+          client.clone(),
+          inherent_benchmark_data()?,
+          vec![],
+          &RemarkBuilder::new(client),
+        )
       }
 
       BenchmarkCmd::Extrinsic(cmd) => {
@@ -109,6 +121,7 @@ pub fn run() -> sc_cli::Result<()> {
         cmd.run(
           client.clone(),
           inherent_benchmark_data()?,
+          vec![],
           &ExtrinsicFactory(vec![Box::new(RemarkBuilder::new(client))]),
         )
       }
diff --git a/substrate/node/src/command_helper.rs b/substrate/node/src/command_helper.rs
index 50f0645d..01c9bb38 100644
--- a/substrate/node/src/command_helper.rs
+++ b/substrate/node/src/command_helper.rs
@@ -45,7 +45,7 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for RemarkBuilder {
 pub fn create_benchmark_extrinsic(
   client: &FullClient,
   sender: sp_core::sr25519::Pair,
-  call: runtime::Call,
+  call: runtime::RuntimeCall,
   nonce: u32,
 ) -> runtime::UncheckedExtrinsic {
   let extra = (
diff --git a/substrate/node/src/service.rs b/substrate/node/src/service.rs
index 167bb2a3..6832fd1d 100644
--- a/substrate/node/src/service.rs
+++ b/substrate/node/src/service.rs
@@ -96,7 +96,7 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
     transaction_pool,
   } = new_partial(&config)?;
 
-  let (network, system_rpc_tx, network_starter) =
+  let (network, system_rpc_tx, tx_handler_controller, network_starter) =
     sc_service::build_network(sc_service::BuildNetworkParams {
       config: &config,
       client: client.clone(),
@@ -142,6 +142,7 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
     rpc_builder: rpc_extensions_builder,
     backend,
     system_rpc_tx,
+    tx_handler_controller,
     config,
     telemetry: telemetry.as_mut(),
   })?;
diff --git a/substrate/runtime/src/lib.rs b/substrate/runtime/src/lib.rs
index 047ba459..a78dc8a9 100644
--- a/substrate/runtime/src/lib.rs
+++ b/substrate/runtime/src/lib.rs
@@ -17,11 +17,12 @@ use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
 
 use frame_support::{
-  traits::{OnRuntimeUpgrade, ConstU8, ConstU32, ConstU64},
+  traits::{ConstU8, ConstU32, ConstU64},
   weights::{
     constants::{RocksDbWeight, ExtrinsicBaseWeight, BlockExecutionWeight, WEIGHT_PER_SECOND},
-    IdentityFee, Weight, DispatchClass,
+    IdentityFee, Weight,
   },
+  dispatch::DispatchClass,
   parameter_types, construct_runtime,
 };
 pub use frame_system::Call as SystemCall;
@@ -29,7 +30,7 @@ pub use frame_system::Call as SystemCall;
 pub use pallet_timestamp::Call as TimestampCall;
 pub use pallet_balances::Call as BalancesCall;
 use pallet_transaction_payment::CurrencyAdapter;
-use pallet_contracts::{migration, DefaultContractAccessWeight};
+use pallet_contracts::DefaultContractAccessWeight;
 
 /// An index to a block.
 pub type BlockNumber = u32;
@@ -96,7 +97,7 @@ const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
 const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);
 
 /// We allow for 2 seconds of compute with a 6 second average block time.
-const MAXIMUM_BLOCK_WEIGHT: Weight = 2 * WEIGHT_PER_SECOND;
+const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_ref_time(2 * WEIGHT_PER_SECOND.ref_time());
 
 // Prints debug output of the `contracts` pallet to stdout if the node is
 // started with `-lruntime::contracts=debug`.
@@ -156,15 +157,15 @@ impl frame_system::Config for Runtime {
   type BlockWeights = BlockWeights;
   type BlockLength = BlockLength;
   type AccountId = AccountId;
-  type Call = Call;
+  type RuntimeCall = RuntimeCall;
   type Lookup = AccountIdLookup<AccountId, ()>;
   type Index = Index;
   type BlockNumber = BlockNumber;
   type Hash = Hash;
   type Hashing = BlakeTwo256;
   type Header = Header;
-  type Event = Event;
-  type Origin = Origin;
+  type RuntimeOrigin = RuntimeOrigin;
+  type RuntimeEvent = RuntimeEvent;
   type BlockHashCount = BlockHashCount;
   type DbWeight = RocksDbWeight;
   type Version = Version;
@@ -195,7 +196,7 @@ impl pallet_balances::Config for Runtime {
   type MaxReserves = ();
   type ReserveIdentifier = [u8; 8];
   type Balance = Balance;
-  type Event = Event;
+  type RuntimeEvent = RuntimeEvent;
   type DustRemoval = ();
   type ExistentialDeposit = ConstU64<500>;
   type AccountStore = System;
@@ -203,7 +204,7 @@ impl pallet_balances::Config for Runtime {
 }
 
 impl pallet_transaction_payment::Config for Runtime {
-  type Event = Event;
+  type RuntimeEvent = RuntimeEvent;
   type OnChargeTransaction = CurrencyAdapter<Balances, ()>;
   type OperationalFeeMultiplier = ConstU8<5>;
   type WeightToFee = IdentityFee<Balance>;
@@ -215,8 +216,8 @@ impl pallet_contracts::Config for Runtime {
   type Time = Timestamp;
   type Randomness = RandomnessCollectiveFlip;
   type Currency = Balances;
-  type Event = Event;
-  type Call = Call;
+  type RuntimeEvent = RuntimeEvent;
+  type RuntimeCall = RuntimeCall;
 
   /// The safest default is to allow no calls at all.
   ///
@@ -238,17 +239,9 @@ impl pallet_contracts::Config for Runtime {
   type ContractAccessWeight = DefaultContractAccessWeight<BlockWeights>;
 
   type MaxCodeLen = ConstU32<{ 128 * 1024 }>;
-  type RelaxedMaxCodeLen = ConstU32<{ 256 * 1024 }>;
   type MaxStorageKeyLen = ConstU32<128>;
 }
 
-pub struct Migrations;
-impl OnRuntimeUpgrade for Migrations {
-  fn on_runtime_upgrade() -> Weight {
-    migration::migrate::<Runtime>()
-  }
-}
-
 pub type Address = sp_runtime::MultiAddress<AccountId, ()>;
 pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
 pub type Block = generic::Block<Header, UncheckedExtrinsic>;
@@ -262,8 +255,9 @@ pub type SignedExtra = (
   frame_system::CheckWeight<Runtime>,
   pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
 );
-pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;
-pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
+pub type UncheckedExtrinsic =
+  generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
+pub type SignedPayload = generic::SignedPayload<RuntimeCall, SignedExtra>;
 pub type Executive = frame_executive::Executive<
   Runtime,
   Block,
@@ -410,7 +404,7 @@ sp_api::impl_runtime_apis! {
         origin,
         dest,
         value,
-        gas_limit,
+        Weight::from_ref_time(gas_limit),
         storage_deposit_limit,
         input_data,
         CONTRACTS_DEBUG_OUTPUT
@@ -429,7 +423,7 @@ sp_api::impl_runtime_apis! {
       Contracts::bare_instantiate(
         origin,
         value,
-        gas_limit,
+        Weight::from_ref_time(gas_limit),
         storage_deposit_limit,
         code,
         data,
@@ -453,65 +447,4 @@ sp_api::impl_runtime_apis! {
       Contracts::get_storage(address, key)
     }
   }
-
-  #[cfg(feature = "runtime-benchmarks")]
-  impl frame_benchmarking::Benchmark<Block> for Runtime {
-    fn benchmark_metadata(extra: bool) -> (
-      Vec<frame_benchmarking::BenchmarkList>,
-      Vec<frame_support::traits::StorageInfo>,
-    ) {
-      use frame_benchmarking::{baseline, Benchmarking, BenchmarkList};
-      use frame_support::traits::StorageInfoTrait;
-      use frame_system_benchmarking::Pallet as SystemBench;
-      use baseline::Pallet as BaselineBench;
-
-      let mut list = Vec::<BenchmarkList>::new();
-      list_benchmarks!(list, extra);
-
-      let storage_info = AllPalletsWithSystem::storage_info();
-
-      (list, storage_info)
-    }
-
-    fn dispatch_benchmark(
-      config: frame_benchmarking::BenchmarkConfig
-    ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
-      use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch, TrackedStorageKey};
-
-      use frame_system_benchmarking::Pallet as SystemBench;
-      use baseline::Pallet as BaselineBench;
-
-      impl frame_system_benchmarking::Config for Runtime {}
-      impl baseline::Config for Runtime {}
-
-      let whitelist: Vec<TrackedStorageKey> = vec![
-        // Block Number
-        hex_literal::hex!(
-          "26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac"
-        ).to_vec().into(),
-        // Total Issuance
-        hex_literal::hex!(
-          "c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80"
-        ).to_vec().into(),
-        // Execution Phase
-        hex_literal::hex!(
-          "26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a"
-        ).to_vec().into(),
-        // Event Count
-        hex_literal::hex!(
-          "26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850"
-        ).to_vec().into(),
-        // System Events
-        hex_literal::hex!(
-          "26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7"
-        ).to_vec().into(),
-      ];
-
-      let mut batches = Vec::<BenchmarkBatch>::new();
-      let params = (&config, &whitelist);
-      add_benchmarks!(params, batches);
-
-      Ok(batches)
-    }
-  }
 }