diff --git a/Cargo.lock b/Cargo.lock
index 350ab1d07370..7f6f2395c28c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,7 +1,5 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
-
 [[package]]
 name = "Inflector"
 version = "0.11.4"
@@ -18,7 +16,16 @@ version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7"
 dependencies = [
- "gimli",
+ "gimli 0.23.0",
+]
+
+[[package]]
+name = "addr2line"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03345e98af8f3d786b6d9f656ccfa6ac316d954e92bc4841f0bba20789d5fb5a"
+dependencies = [
+ "gimli 0.24.0",
 ]
 
 [[package]]
@@ -216,26 +223,29 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.3.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d373d78ded7d0b3fa8039375718cde0aace493f2e34fb60f51cbf567562ca801"
+checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965"
 dependencies = [
  "async-task",
  "concurrent-queue",
  "fastrand",
  "futures-lite",
  "once_cell",
- "vec-arena",
+ "slab",
 ]
 
 [[package]]
 name = "async-global-executor"
-version = "1.4.2"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "124ac8c265e407641c3362b8f4d39cdb4e243885b71eef087be27199790f5a3a"
+checksum = "9586ec52317f36de58453159d48351bc244bc24ced3effc1fce22f3d48664af6"
 dependencies = [
+ "async-channel",
  "async-executor",
  "async-io",
+ "async-mutex",
+ "blocking",
  "futures-lite",
  "num_cpus",
  "once_cell",
@@ -261,6 +271,15 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "async-lock"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b"
+dependencies = [
+ "event-listener",
+]
+
 [[package]]
 name = "async-mutex"
 version = "1.4.0"
@@ -288,17 +307,16 @@ dependencies = [
 
 [[package]]
 name = "async-std"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f9f84f1280a2b436a2c77c2582602732b6c2f4321d5494d6e799e6c367859a8"
+checksum = "d9f06685bad74e0570f5213741bea82158279a4103d988e57bfada11ad230341"
 dependencies = [
  "async-attributes",
  "async-channel",
  "async-global-executor",
  "async-io",
- "async-mutex",
+ "async-lock",
  "async-process",
- "blocking",
  "crossbeam-utils 0.8.1",
  "futures-channel",
  "futures-core",
@@ -411,11 +429,11 @@ version = "0.3.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc"
 dependencies = [
- "addr2line",
+ "addr2line 0.14.1",
  "cfg-if 1.0.0",
  "libc",
  "miniz_oxide",
- "object",
+ "object 0.23.0",
  "rustc-demangle",
 ]
 
@@ -454,14 +472,17 @@ name = "beef"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6736e2428df2ca2848d846c43e88745121a6654696e349ce0054a420815a7409"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "beefy-gadget"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#6008d67f94262f955017fad3c1648e3206756a60"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget#a58179d4f59f4c31c7a09d5b0ce14df8450743a3"
 dependencies = [
  "beefy-primitives",
- "futures 0.3.14",
+ "futures 0.3.15",
  "hex",
  "log",
  "parity-scale-codec",
@@ -486,11 +507,11 @@ dependencies = [
 [[package]]
 name = "beefy-gadget-rpc"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#6008d67f94262f955017fad3c1648e3206756a60"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget#a58179d4f59f4c31c7a09d5b0ce14df8450743a3"
 dependencies = [
  "beefy-gadget",
  "beefy-primitives",
- "futures 0.3.14",
+ "futures 0.3.15",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -507,7 +528,7 @@ dependencies = [
 [[package]]
 name = "beefy-primitives"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#6008d67f94262f955017fad3c1648e3206756a60"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget#a58179d4f59f4c31c7a09d5b0ce14df8450743a3"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -864,14 +885,24 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
 
+[[package]]
+name = "cargo-platform"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0226944a63d1bf35a3b5f948dd7c59e263db83695c9e8bffc4037de02e30f1d7"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "cargo_metadata"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83f95cf4bf0dda0ac2e65371ae7215d0dce3c187613a9dbf23aaa9374186f97a"
+checksum = "7714a157da7991e23d90686b9524b9e12e0407a108647f52e9328f4b3d51ac7f"
 dependencies = [
+ "cargo-platform",
  "semver 0.11.0",
- "semver-parser 0.10.0",
+ "semver-parser 0.10.2",
  "serde",
  "serde_json",
 ]
@@ -1025,29 +1056,15 @@ dependencies = [
 
 [[package]]
 name = "color-eyre"
-version = "0.5.10"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b29030875fd8376e4a28ef497790d5b4a7843d8d1396bf08ce46f5eec562c5c"
+checksum = "1f1885697ee8a177096d42f158922251a41973117f6d8a234cee94b9509157b7"
 dependencies = [
  "backtrace",
- "color-spantrace",
  "eyre",
  "indenter",
  "once_cell",
  "owo-colors",
- "tracing-error",
-]
-
-[[package]]
-name = "color-spantrace"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6eee477a4a8a72f4addd4de416eb56d54bc307b284d6601bafdee1f4ea462d1"
-dependencies = [
- "once_cell",
- "owo-colors",
- "tracing-core",
- "tracing-error",
 ]
 
 [[package]]
@@ -1081,7 +1098,17 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
 dependencies = [
- "core-foundation-sys",
+ "core-foundation-sys 0.7.0",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
+dependencies = [
+ "core-foundation-sys 0.8.2",
  "libc",
 ]
 
@@ -1091,6 +1118,12 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
 
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
+
 [[package]]
 name = "cpp_demangle"
 version = "0.3.2"
@@ -1101,6 +1134,15 @@ dependencies = [
  "glob",
 ]
 
+[[package]]
+name = "cpufeatures"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed00c67cb5d0a7d64a44f6ad2668db7e7530311dd53ea79bcd4fb022c64911c8"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "cpuid-bool"
 version = "0.1.0"
@@ -1109,38 +1151,36 @@ checksum = "6d375c433320f6c5057ae04a04376eef4d04ce2801448cf8863a78da99107be4"
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.71.0"
+version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcee7a5107071484772b89fdf37f0f460b7db75f476e43ea7a684fd942470bcf"
+checksum = "c8ca3560686e7c9c7ed7e0fe77469f2410ba5d7781b1acaa9adc8d8deea28e3e"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.71.0"
+version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "654ab96f0f1cab71c0d323618a58360a492da2c341eb2c1f977fc195c664001b"
+checksum = "baf9bf1ffffb6ce3d2e5ebc83549bd2436426c99b31cc550d521364cbe35d276"
 dependencies = [
- "byteorder",
  "cranelift-bforest",
  "cranelift-codegen-meta",
  "cranelift-codegen-shared",
  "cranelift-entity",
- "gimli",
+ "gimli 0.24.0",
  "log",
  "regalloc",
  "serde",
  "smallvec 1.6.1",
  "target-lexicon",
- "thiserror",
 ]
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.71.0"
+version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65994cfc5be9d5fd10c5fc30bcdddfa50c04bb79c91329287bff846434ff8f14"
+checksum = "4cc21936a5a6d07e23849ffe83e5c1f6f50305c074f4b2970ca50c13bf55b821"
 dependencies = [
  "cranelift-codegen-shared",
  "cranelift-entity",
@@ -1148,27 +1188,27 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.71.0"
+version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "889d720b688b8b7df5e4903f9b788c3c59396050f5548e516e58ccb7312463ab"
+checksum = "ca5b6ffaa87560bebe69a5446449da18090b126037920b0c1c6d5945f72faf6b"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cranelift-entity"
-version = "0.71.0"
+version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a2e6884a363e42a9ba980193ea8603a4272f8a92bd8bbaf9f57a94dbea0ff96"
+checksum = "7d6b4a8bef04f82e4296782646f733c641d09497df2fabf791323fefaa44c64c"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.71.0"
+version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6f41e2f9b57d2c030e249d0958f1cdc2c3cd46accf8c0438b3d1944e9153444"
+checksum = "c31b783b351f966fce33e3c03498cb116d16d97a8f9978164a60920bd0d3a99c"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -1178,9 +1218,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-native"
-version = "0.71.0"
+version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aab70ba7575665375d31cbdea2462916ce58be887834e1b83c860b43b51af637"
+checksum = "a77c88d3dd48021ff1e37e978a00098524abd3513444ae252c08d37b310b3d2a"
 dependencies = [
  "cranelift-codegen",
  "target-lexicon",
@@ -1188,9 +1228,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-wasm"
-version = "0.71.0"
+version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2fc3d2e70da6439adf97648dcdf81834363154f2907405345b6fbe7ca38918c"
+checksum = "edb6d408e2da77cdbbd65466298d44c86ae71c1785d2ab0d8657753cdb4d9d89"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1401,6 +1441,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "diff"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
+
 [[package]]
 name = "difference"
 version = "2.0.0"
@@ -1491,6 +1537,12 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
+[[package]]
+name = "downcast-rs"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+
 [[package]]
 name = "dyn-clonable"
 version = "0.9.0"
@@ -1691,7 +1743,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
 ]
 
 [[package]]
@@ -1789,7 +1841,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c6447e2f8178843749e8c8003206def83ec124a7859475395777a28b5338647c"
 dependencies = [
  "either",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "log",
  "num-traits",
@@ -1837,7 +1889,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1855,7 +1907,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "3.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1874,7 +1926,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "Inflector",
  "chrono",
@@ -1897,7 +1949,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1910,7 +1962,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1925,7 +1977,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1936,13 +1988,14 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "bitflags",
  "frame-metadata",
  "frame-support-procedural",
  "impl-trait-for-tuples",
  "log",
+ "max-encoded-len",
  "once_cell",
  "parity-scale-codec",
  "paste 1.0.4",
@@ -1962,7 +2015,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -1974,7 +2027,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 1.0.0",
@@ -1986,7 +2039,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1996,13 +2049,13 @@ dependencies = [
 [[package]]
 name = "frame-support-test"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-metadata",
  "frame-support",
  "frame-system",
  "parity-scale-codec",
- "pretty_assertions",
+ "pretty_assertions 0.6.1",
  "rustversion",
  "serde",
  "sp-core",
@@ -2016,7 +2069,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -2033,7 +2086,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2047,7 +2100,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2056,7 +2109,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -2135,9 +2188,9 @@ checksum = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef"
 
 [[package]]
 name = "futures"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253"
+checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2150,9 +2203,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25"
+checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2160,9 +2213,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815"
+checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1"
 
 [[package]]
 name = "futures-cpupool"
@@ -2174,27 +2227,11 @@ dependencies = [
  "num_cpus",
 ]
 
-[[package]]
-name = "futures-diagnose"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdcef58a173af8148b182684c9f2d5250875adbcaff7b5794073894f9d8634a9"
-dependencies = [
- "futures 0.1.29",
- "futures 0.3.14",
- "lazy_static",
- "log",
- "parking_lot 0.9.0",
- "pin-project 0.4.23",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "futures-executor"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d"
+checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2204,9 +2241,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04"
+checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1"
 
 [[package]]
 name = "futures-lite"
@@ -2225,10 +2262,11 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b"
+checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121"
 dependencies = [
+ "autocfg",
  "proc-macro-hack",
  "proc-macro2",
  "quote",
@@ -2242,21 +2280,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b"
 dependencies = [
  "futures-io",
- "rustls 0.19.0",
+ "rustls 0.19.1",
  "webpki",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23"
+checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282"
 
 [[package]]
 name = "futures-task"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc"
+checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae"
 
 [[package]]
 name = "futures-timer"
@@ -2276,10 +2314,11 @@ dependencies = [
 
 [[package]]
 name = "futures-util"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025"
+checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967"
 dependencies = [
+ "autocfg",
  "futures 0.1.29",
  "futures-channel",
  "futures-core",
@@ -2381,6 +2420,12 @@ name = "gimli"
 version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
+
+[[package]]
+name = "gimli"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189"
 dependencies = [
  "fallible-iterator",
  "indexmap",
@@ -2616,6 +2661,17 @@ dependencies = [
  "http 0.2.1",
 ]
 
+[[package]]
+name = "http-body"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9"
+dependencies = [
+ "bytes 1.0.1",
+ "http 0.2.1",
+ "pin-project-lite 0.2.4",
+]
+
 [[package]]
 name = "httparse"
 version = "1.3.4"
@@ -2689,7 +2745,7 @@ dependencies = [
  "httparse",
  "httpdate",
  "itoa",
- "pin-project 1.0.4",
+ "pin-project 1.0.7",
  "socket2 0.3.17",
  "tokio 0.2.21",
  "tower-service",
@@ -2697,6 +2753,28 @@ dependencies = [
  "want 0.3.0",
 ]
 
+[[package]]
+name = "hyper"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1"
+dependencies = [
+ "bytes 1.0.1",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "http 0.2.1",
+ "http-body 0.4.2",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project 1.0.7",
+ "tokio 1.6.1",
+ "tower-service",
+ "tracing",
+ "want 0.3.0",
+]
+
 [[package]]
 name = "hyper-rustls"
 version = "0.21.0"
@@ -2709,9 +2787,9 @@ dependencies = [
  "hyper 0.13.9",
  "log",
  "rustls 0.18.0",
- "rustls-native-certs",
+ "rustls-native-certs 0.4.0",
  "tokio 0.2.21",
- "tokio-rustls",
+ "tokio-rustls 0.14.0",
  "webpki",
 ]
 
@@ -2765,7 +2843,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a6d52908d4ea4ab2bc22474ba149bf1011c8e2c3ebc1ff593ae28ac44f494b6"
 dependencies = [
  "async-io",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-lite",
  "if-addrs",
  "ipnet",
@@ -2858,7 +2936,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 2.0.2",
 ]
 
@@ -3080,30 +3158,11 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "jsonrpsee-http-client"
-version = "0.2.0-alpha.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2737440f37efa10e5ef7beeec43d059d29dc92640978be21fcdcef481a2edb0d"
-dependencies = [
- "async-trait",
- "fnv",
- "hyper 0.13.9",
- "hyper-rustls",
- "jsonrpsee-types",
- "jsonrpsee-utils",
- "log",
- "serde",
- "serde_json",
- "thiserror",
- "url 2.2.0",
-]
-
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.2.0-alpha.6"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5784ee8bb31988fa2c7a755fe31b0e21aa51894a67e5c99b6d4470f0253bf31a"
+checksum = "3b4c85cfa6767333f3e5f3b2f2f765dad2727b0033ee270ae07c599bf43ed5ae"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.0.0",
@@ -3114,29 +3173,44 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.2.0-alpha.6"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab3dabceeeeb865897661d532d47202eaae71cd2c606f53cb69f1fbc0555a51"
+checksum = "c0cf7bd4e93b3b56e59131de7f24afbea871faf914e97bcdd942c86927ab0172"
 dependencies = [
  "async-trait",
  "beef",
  "futures-channel",
  "futures-util",
+ "hyper 0.14.5",
  "log",
  "serde",
  "serde_json",
+ "soketto 0.5.0",
  "thiserror",
 ]
 
 [[package]]
-name = "jsonrpsee-utils"
-version = "0.2.0-alpha.6"
+name = "jsonrpsee-ws-client"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d63cf4d423614e71fd144a8691208539d2b23d8373e069e2fbe023c5eba5e922"
+checksum = "6ec51150965544e1a4468f372bdab8545243a1b045d4ab272023aac74c60de32"
 dependencies = [
- "futures-util",
- "hyper 0.13.9",
+ "async-trait",
+ "fnv",
+ "futures 0.3.15",
  "jsonrpsee-types",
+ "log",
+ "pin-project 1.0.7",
+ "rustls 0.19.1",
+ "rustls-native-certs 0.5.0",
+ "serde",
+ "serde_json",
+ "soketto 0.5.0",
+ "thiserror",
+ "tokio 0.2.21",
+ "tokio-rustls 0.15.0",
+ "tokio-util",
+ "url 2.2.0",
 ]
 
 [[package]]
@@ -3157,11 +3231,12 @@ dependencies = [
 
 [[package]]
 name = "kusama-runtime"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "beefy-primitives",
  "bitvec",
  "frame-benchmarking",
+ "frame-election-provider-support",
  "frame-executive",
  "frame-support",
  "frame-system",
@@ -3171,6 +3246,7 @@ dependencies = [
  "hex-literal",
  "libsecp256k1",
  "log",
+ "max-encoded-len",
  "pallet-authority-discovery",
  "pallet-authorship",
  "pallet-babe",
@@ -3298,7 +3374,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb1e98ba343d0b35f9009a8844cd2b87fa3192f7e79033ac05b00aeae0f3b0b5"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "js-sys",
  "kvdb",
  "kvdb-memorydb",
@@ -3368,7 +3444,7 @@ checksum = "08053fbef67cd777049ef7a95ebaca2ece370b4ed7712c3fa404d69a88cb741b"
 dependencies = [
  "atomic",
  "bytes 1.0.1",
- "futures 0.3.14",
+ "futures 0.3.15",
  "lazy_static",
  "libp2p-core",
  "libp2p-deflate",
@@ -3394,7 +3470,7 @@ dependencies = [
  "libp2p-yamux",
  "parity-multiaddr",
  "parking_lot 0.11.1",
- "pin-project 1.0.4",
+ "pin-project 1.0.7",
  "smallvec 1.6.1",
  "wasm-timer",
 ]
@@ -3410,7 +3486,7 @@ dependencies = [
  "ed25519-dalek",
  "either",
  "fnv",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "lazy_static",
  "libsecp256k1",
@@ -3419,7 +3495,7 @@ dependencies = [
  "multistream-select",
  "parity-multiaddr",
  "parking_lot 0.11.1",
- "pin-project 1.0.4",
+ "pin-project 1.0.7",
  "prost",
  "prost-build",
  "rand 0.7.3",
@@ -3440,7 +3516,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2181a641cd15f9b6ba71b1335800f309012a0a97a29ffaabbbf40e9d3d58f08"
 dependencies = [
  "flate2",
- "futures 0.3.14",
+ "futures 0.3.15",
  "libp2p-core",
 ]
 
@@ -3451,7 +3527,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62e63dab8b5ff35e0c101a3e51e843ba782c07bbb1682f5fd827622e0d02b98b"
 dependencies = [
  "async-std-resolver",
- "futures 0.3.14",
+ "futures 0.3.15",
  "libp2p-core",
  "log",
  "smallvec 1.6.1",
@@ -3466,7 +3542,7 @@ checksum = "48a9b570f6766301d9c4aa00fce3554cad1598e2f466debbc4dde909028417cf"
 dependencies = [
  "cuckoofilter",
  "fnv",
- "futures 0.3.14",
+ "futures 0.3.15",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3487,7 +3563,7 @@ dependencies = [
  "byteorder",
  "bytes 1.0.1",
  "fnv",
- "futures 0.3.14",
+ "futures 0.3.15",
  "hex_fmt",
  "libp2p-core",
  "libp2p-swarm",
@@ -3508,7 +3584,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f668f00efd9883e8b7bcc582eaf0164615792608f886f6577da18bcbeea0a46"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3529,7 +3605,7 @@ dependencies = [
  "bytes 1.0.1",
  "either",
  "fnv",
- "futures 0.3.14",
+ "futures 0.3.15",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3553,7 +3629,7 @@ dependencies = [
  "async-io",
  "data-encoding",
  "dns-parser",
- "futures 0.3.14",
+ "futures 0.3.15",
  "if-watch",
  "lazy_static",
  "libp2p-core",
@@ -3573,7 +3649,7 @@ checksum = "85e9b544335d1ed30af71daa96edbefadef6f19c7a55f078b9fc92c87163105d"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
- "futures 0.3.14",
+ "futures 0.3.15",
  "libp2p-core",
  "log",
  "nohash-hasher",
@@ -3591,7 +3667,7 @@ checksum = "36db0f0db3b0433f5b9463f1c0cd9eadc0a3734a9170439ce501ff99733a88bd"
 dependencies = [
  "bytes 1.0.1",
  "curve25519-dalek 3.0.0",
- "futures 0.3.14",
+ "futures 0.3.15",
  "lazy_static",
  "libp2p-core",
  "log",
@@ -3611,7 +3687,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf4bfaffac63bf3c7ec11ed9d8879d455966ddea7e78ee14737f0b6dce0d1cd1"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3628,7 +3704,7 @@ checksum = "0c8c37b4d2a075b4be8442760a5f8c037180f0c8dd5b5734b9978ab868b3aa11"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
- "futures 0.3.14",
+ "futures 0.3.15",
  "libp2p-core",
  "log",
  "prost",
@@ -3643,9 +3719,9 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce3374f3b28162db9d3442c9347c4f14cb01e8290052615c7d341d40eae0599"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "log",
- "pin-project 1.0.4",
+ "pin-project 1.0.7",
  "rand 0.7.3",
  "salsa20",
  "sha3",
@@ -3659,12 +3735,12 @@ checksum = "0b8786aca3f18671d8776289706a5521f6c9124a820f69e358de214b9939440d"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "pin-project 1.0.4",
+ "pin-project 1.0.7",
  "prost",
  "prost-build",
  "rand 0.7.3",
@@ -3682,7 +3758,7 @@ checksum = "1cdbe172f08e6d0f95fa8634e273d4c4268c4063de2e33e7435194b0130c62e3"
 dependencies = [
  "async-trait",
  "bytes 1.0.1",
- "futures 0.3.14",
+ "futures 0.3.15",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3701,7 +3777,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e04d8e1eef675029ec728ba14e8d0da7975d84b6679b699b4ae91a1de9c3a92"
 dependencies = [
  "either",
- "futures 0.3.14",
+ "futures 0.3.15",
  "libp2p-core",
  "log",
  "rand 0.7.3",
@@ -3727,7 +3803,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b1a27d21c477951799e99d5c105d78868258502ce092988040a808d5a19bbd9"
 dependencies = [
  "async-io",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "if-watch",
  "ipnet",
@@ -3744,7 +3820,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffd6564bb3b7ff203661ccbb69003c2b551e34cef974f2d6c6a28306a12170b5"
 dependencies = [
  "async-std",
- "futures 0.3.14",
+ "futures 0.3.15",
  "libp2p-core",
  "log",
 ]
@@ -3755,7 +3831,7 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cef45d61e43c313531b5e903e4e8415212ff6338e0c54c47da5b9b412b5760de"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "js-sys",
  "libp2p-core",
  "parity-send-wrapper",
@@ -3770,13 +3846,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cace60995ef6f637e4752cccbb2590f6bc358e8741a0d066307636c69a4b3a74"
 dependencies = [
  "either",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-rustls",
  "libp2p-core",
  "log",
  "quicksink",
  "rw-stream-sink",
- "soketto",
+ "soketto 0.4.1",
  "url 2.2.0",
  "webpki-roots",
 ]
@@ -3787,7 +3863,7 @@ version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f35da42cfc6d5cb0dcf3ad6881bc68d146cdf38f98655e09e33fbba4d13eabc4"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "libp2p-core",
  "parking_lot 0.11.1",
  "thiserror",
@@ -3963,6 +4039,28 @@ dependencies = [
  "rawpointer",
 ]
 
+[[package]]
+name = "max-encoded-len"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
+dependencies = [
+ "impl-trait-for-tuples",
+ "max-encoded-len-derive",
+ "parity-scale-codec",
+ "primitive-types",
+]
+
+[[package]]
+name = "max-encoded-len-derive"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
+dependencies = [
+ "proc-macro-crate 1.0.0",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "maybe-uninit"
 version = "2.0.0"
@@ -4046,7 +4144,7 @@ version = "0.1.0"
 dependencies = [
  "assert_matches",
  "derive_more",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
 ]
 
@@ -4056,7 +4154,7 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c023c3f16109e7f33aa451f773fd61070e265b4977d0b6e344a51049296dd7df"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "rand 0.7.3",
  "thrift",
 ]
@@ -4227,9 +4325,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10ddc0eb0117736f19d556355464fc87efc8ad98b29e3fd84f02531eb6e90840"
 dependencies = [
  "bytes 1.0.1",
- "futures 0.3.14",
+ "futures 0.3.15",
  "log",
- "pin-project 1.0.4",
+ "pin-project 1.0.7",
  "smallvec 1.6.1",
  "unsigned-varint 0.6.0",
 ]
@@ -4384,6 +4482,12 @@ name = "object"
 version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
+
+[[package]]
+name = "object"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5b3dd1c072ee7963717671d1ca129f1048fda25edea6b752bfc71ac8854170"
 dependencies = [
  "crc32fast",
  "indexmap",
@@ -4452,7 +4556,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b"
 [[package]]
 name = "pallet-authority-discovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4467,7 +4571,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4481,7 +4585,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4504,12 +4608,13 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
+ "max-encoded-len",
  "parity-scale-codec",
  "sp-runtime",
  "sp-std",
@@ -4518,7 +4623,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#6008d67f94262f955017fad3c1648e3206756a60"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget#a58179d4f59f4c31c7a09d5b0ce14df8450743a3"
 dependencies = [
  "beefy-primitives",
  "frame-support",
@@ -4533,7 +4638,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4569,7 +4674,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4585,7 +4690,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4600,7 +4705,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4621,7 +4726,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4638,7 +4743,7 @@ dependencies = [
 [[package]]
 name = "pallet-gilt"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4651,8 +4756,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-grandpa"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+version = "3.1.0"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4664,6 +4769,7 @@ dependencies = [
  "sp-application-crypto",
  "sp-core",
  "sp-finality-grandpa",
+ "sp-io",
  "sp-runtime",
  "sp-session",
  "sp-staking",
@@ -4673,7 +4779,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4688,7 +4794,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4707,7 +4813,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4723,7 +4829,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4738,7 +4844,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "ckb-merkle-mountain-range",
  "frame-benchmarking",
@@ -4755,7 +4861,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-primitives"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4771,7 +4877,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4789,7 +4895,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4804,7 +4910,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4817,7 +4923,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4833,7 +4939,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4855,11 +4961,12 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "max-encoded-len",
  "parity-scale-codec",
  "sp-core",
  "sp-io",
@@ -4870,7 +4977,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4883,7 +4990,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4897,7 +5004,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4912,11 +5019,12 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
+ "log",
  "pallet-timestamp",
  "parity-scale-codec",
  "sp-core",
@@ -4931,7 +5039,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4947,7 +5055,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4960,7 +5068,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4984,7 +5092,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -4995,7 +5103,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -5004,7 +5112,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5017,7 +5125,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5035,7 +5143,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5050,7 +5158,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5066,7 +5174,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -5083,7 +5191,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -5094,7 +5202,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5110,7 +5218,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5125,7 +5233,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -5152,9 +5260,9 @@ dependencies = [
 
 [[package]]
 name = "parity-db"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "495197c078e54b8735181aa35c00a327f7f3a3cc00a1ee8c95926dd010f0ec6b"
+checksum = "2e337f62db341435f0da05b8f6b97e984ef4ea5800510cd07c2d624688c40b47"
 dependencies = [
  "blake2-rfc",
  "crc32fast",
@@ -5276,9 +5384,9 @@ dependencies = [
 
 [[package]]
 name = "parity-wasm"
-version = "0.41.0"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc878dac00da22f8f61e7af3157988424567ab01d9920b962ef7dcbd7cd865"
+checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92"
 
 [[package]]
 name = "parity-ws"
@@ -5293,7 +5401,7 @@ dependencies = [
  "mio",
  "mio-extras",
  "rand 0.7.3",
- "sha-1",
+ "sha-1 0.8.2",
  "slab",
  "url 2.2.0",
 ]
@@ -5488,7 +5596,7 @@ checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
 dependencies = [
  "maplit",
  "pest",
- "sha-1",
+ "sha-1 0.8.2",
 ]
 
 [[package]]
@@ -5512,11 +5620,11 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.0.4"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b70b68509f17aa2857863b6fa00bf21fc93674c7a8893de2f469f6aa7ca2f2"
+checksum = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4"
 dependencies = [
- "pin-project-internal 1.0.4",
+ "pin-project-internal 1.0.7",
 ]
 
 [[package]]
@@ -5532,9 +5640,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.4"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caa25a6393f22ce819b0f50e0be89287292fda8d425be38ee0ca14c4931d9e71"
+checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5573,17 +5681,14 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325"
 
 [[package]]
 name = "polkadot"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "assert_cmd",
  "color-eyre",
- "futures 0.3.14",
  "nix",
  "parity-util-mem",
  "polkadot-cli",
- "polkadot-service",
  "tempfile",
- "thiserror",
 ]
 
 [[package]]
@@ -5592,7 +5697,7 @@ version = "0.1.0"
 dependencies = [
  "assert_matches",
  "env_logger 0.8.2",
- "futures 0.3.14",
+ "futures 0.3.15",
  "log",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
@@ -5613,7 +5718,7 @@ dependencies = [
  "assert_matches",
  "bitvec",
  "env_logger 0.8.2",
- "futures 0.3.14",
+ "futures 0.3.15",
  "log",
  "maplit",
  "polkadot-node-network-protocol",
@@ -5632,7 +5737,7 @@ name = "polkadot-availability-distribution"
 version = "0.1.0"
 dependencies = [
  "assert_matches",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "lru",
  "maplit",
@@ -5664,7 +5769,7 @@ version = "0.1.0"
 dependencies = [
  "assert_matches",
  "env_logger 0.8.2",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "log",
  "lru",
@@ -5688,10 +5793,10 @@ dependencies = [
 
 [[package]]
 name = "polkadot-cli"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "frame-benchmarking-cli",
- "futures 0.3.14",
+ "futures 0.3.15",
  "log",
  "polkadot-node-core-pvf",
  "polkadot-service",
@@ -5708,6 +5813,37 @@ dependencies = [
  "wasm-bindgen-futures",
 ]
 
+[[package]]
+name = "polkadot-client"
+version = "0.9.3"
+dependencies = [
+ "beefy-primitives",
+ "frame-benchmarking",
+ "frame-system-rpc-runtime-api",
+ "kusama-runtime",
+ "pallet-mmr-primitives",
+ "pallet-transaction-payment-rpc-runtime-api",
+ "polkadot-primitives",
+ "polkadot-runtime",
+ "rococo-runtime",
+ "sc-client-api",
+ "sc-executor",
+ "sc-service",
+ "sp-api",
+ "sp-authority-discovery",
+ "sp-block-builder",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-consensus-babe",
+ "sp-finality-grandpa",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-session",
+ "sp-storage",
+ "sp-transaction-pool",
+ "westend-runtime",
+]
+
 [[package]]
 name = "polkadot-collator-protocol"
 version = "0.1.0"
@@ -5715,7 +5851,7 @@ dependencies = [
  "always-assert",
  "assert_matches",
  "env_logger 0.8.2",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "log",
  "polkadot-node-network-protocol",
@@ -5734,7 +5870,7 @@ dependencies = [
 
 [[package]]
 name = "polkadot-core-primitives"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
@@ -5745,7 +5881,7 @@ dependencies = [
 
 [[package]]
 name = "polkadot-erasure-coding"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-primitives",
@@ -5761,7 +5897,7 @@ name = "polkadot-gossip-support"
 version = "0.1.0"
 dependencies = [
  "assert_matches",
- "futures 0.3.14",
+ "futures 0.3.15",
  "polkadot-node-network-protocol",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-test-helpers",
@@ -5781,7 +5917,7 @@ version = "0.1.0"
 dependencies = [
  "assert_matches",
  "async-trait",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -5803,7 +5939,7 @@ dependencies = [
 name = "polkadot-node-collation-generation"
 version = "0.1.0"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "parity-scale-codec",
  "polkadot-erasure-coding",
  "polkadot-node-primitives",
@@ -5824,7 +5960,7 @@ dependencies = [
  "assert_matches",
  "bitvec",
  "derive_more",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "kvdb",
  "kvdb-memorydb",
@@ -5862,7 +5998,7 @@ dependencies = [
  "assert_matches",
  "bitvec",
  "env_logger 0.8.2",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "kvdb",
  "kvdb-memorydb",
@@ -5888,7 +6024,7 @@ version = "0.1.0"
 dependencies = [
  "assert_matches",
  "bitvec",
- "futures 0.3.14",
+ "futures 0.3.15",
  "polkadot-erasure-coding",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
@@ -5910,7 +6046,7 @@ dependencies = [
 name = "polkadot-node-core-bitfield-signing"
 version = "0.1.0"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-test-helpers",
  "polkadot-node-subsystem-util",
@@ -5922,54 +6058,78 @@ dependencies = [
 ]
 
 [[package]]
-name = "polkadot-node-core-candidate-selection"
+name = "polkadot-node-core-candidate-validation"
 version = "0.1.0"
 dependencies = [
- "futures 0.3.14",
+ "assert_matches",
+ "async-trait",
+ "futures 0.3.15",
+ "parity-scale-codec",
+ "polkadot-node-core-pvf",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-test-helpers",
  "polkadot-node-subsystem-util",
+ "polkadot-parachain",
  "polkadot-primitives",
  "sp-core",
- "sp-keystore",
- "thiserror",
+ "sp-keyring",
+ "sp-maybe-compressed-blob",
  "tracing",
 ]
 
 [[package]]
-name = "polkadot-node-core-candidate-validation"
+name = "polkadot-node-core-chain-api"
+version = "0.1.0"
+dependencies = [
+ "futures 0.3.15",
+ "maplit",
+ "polkadot-node-subsystem",
+ "polkadot-node-subsystem-test-helpers",
+ "polkadot-node-subsystem-util",
+ "polkadot-primitives",
+ "sp-blockchain",
+ "sp-core",
+ "tracing",
+]
+
+[[package]]
+name = "polkadot-node-core-dispute-coordinator"
 version = "0.1.0"
 dependencies = [
  "assert_matches",
- "async-trait",
- "futures 0.3.14",
+ "bitvec",
+ "derive_more",
+ "futures 0.3.15",
+ "kvdb",
+ "kvdb-memorydb",
  "parity-scale-codec",
- "polkadot-node-core-pvf",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-test-helpers",
  "polkadot-node-subsystem-util",
- "polkadot-parachain",
  "polkadot-primitives",
+ "sc-keystore",
  "sp-core",
  "sp-keyring",
- "sp-maybe-compressed-blob",
+ "sp-keystore",
+ "thiserror",
  "tracing",
 ]
 
 [[package]]
-name = "polkadot-node-core-chain-api"
+name = "polkadot-node-core-dispute-participation"
 version = "0.1.0"
 dependencies = [
- "futures 0.3.14",
- "maplit",
+ "assert_matches",
+ "futures 0.3.15",
+ "parity-scale-codec",
+ "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-test-helpers",
- "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "sp-blockchain",
  "sp-core",
+ "thiserror",
  "tracing",
 ]
 
@@ -5978,7 +6138,7 @@ name = "polkadot-node-core-parachains-inherent"
 version = "0.1.0"
 dependencies = [
  "async-trait",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "polkadot-node-subsystem",
  "polkadot-overseer",
@@ -5995,7 +6155,7 @@ name = "polkadot-node-core-provisioner"
 version = "0.1.0"
 dependencies = [
  "bitvec",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-test-helpers",
@@ -6015,12 +6175,12 @@ dependencies = [
  "assert_matches",
  "async-process",
  "async-std",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "hex-literal",
  "libc",
  "parity-scale-codec",
- "pin-project 1.0.4",
+ "pin-project 1.0.7",
  "polkadot-core-primitives",
  "polkadot-parachain",
  "rand 0.8.3",
@@ -6036,14 +6196,13 @@ dependencies = [
  "test-parachain-adder",
  "test-parachain-halt",
  "tracing",
- "wasmtime-jit",
 ]
 
 [[package]]
 name = "polkadot-node-core-runtime-api"
 version = "0.1.0"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "memory-lru",
  "parity-util-mem",
  "polkadot-node-primitives",
@@ -6079,7 +6238,7 @@ dependencies = [
 name = "polkadot-node-network-protocol"
 version = "0.1.0"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "parity-scale-codec",
  "polkadot-node-jaeger",
  "polkadot-node-primitives",
@@ -6093,7 +6252,7 @@ dependencies = [
 name = "polkadot-node-primitives"
 version = "0.1.0"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "parity-scale-codec",
  "polkadot-parachain",
  "polkadot-primitives",
@@ -6104,6 +6263,7 @@ dependencies = [
  "sp-consensus-babe",
  "sp-consensus-vrf",
  "sp-core",
+ "sp-keystore",
  "sp-maybe-compressed-blob",
  "sp-runtime",
  "thiserror",
@@ -6118,14 +6278,14 @@ dependencies = [
  "async-std",
  "async-trait",
  "derive_more",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "lazy_static",
  "log",
  "mick-jaeger",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "pin-project 1.0.4",
+ "pin-project 1.0.7",
  "polkadot-node-jaeger",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
@@ -6146,11 +6306,11 @@ name = "polkadot-node-subsystem-test-helpers"
 version = "0.1.0"
 dependencies = [
  "async-trait",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "pin-project 1.0.4",
+ "pin-project 1.0.7",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
@@ -6170,14 +6330,14 @@ dependencies = [
  "assert_matches",
  "async-trait",
  "env_logger 0.8.2",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "log",
  "lru",
  "metered-channel",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "pin-project 1.0.4",
+ "pin-project 1.0.7",
  "polkadot-node-jaeger",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
@@ -6202,9 +6362,10 @@ dependencies = [
  "assert_matches",
  "async-trait",
  "femme",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "kv-log-macro",
+ "lru",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
@@ -6219,7 +6380,7 @@ dependencies = [
 
 [[package]]
 name = "polkadot-parachain"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "derive_more",
  "parity-scale-codec",
@@ -6233,7 +6394,7 @@ dependencies = [
 
 [[package]]
 name = "polkadot-primitives"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "bitvec",
  "frame-system",
@@ -6242,12 +6403,13 @@ dependencies = [
  "parity-util-mem",
  "polkadot-core-primitives",
  "polkadot-parachain",
- "pretty_assertions",
+ "pretty_assertions 0.7.2",
  "serde",
  "sp-api",
  "sp-application-crypto",
  "sp-arithmetic",
  "sp-authority-discovery",
+ "sp-consensus-slots",
  "sp-core",
  "sp-inherents",
  "sp-io",
@@ -6285,7 +6447,7 @@ dependencies = [
 
 [[package]]
 name = "polkadot-rpc"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "beefy-gadget",
  "beefy-gadget-rpc",
@@ -6317,11 +6479,12 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "beefy-primitives",
  "bitvec",
  "frame-benchmarking",
+ "frame-election-provider-support",
  "frame-executive",
  "frame-support",
  "frame-system",
@@ -6331,6 +6494,7 @@ dependencies = [
  "hex-literal",
  "libsecp256k1",
  "log",
+ "max-encoded-len",
  "pallet-authority-discovery",
  "pallet-authorship",
  "pallet-babe",
@@ -6398,7 +6562,7 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-common"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -6451,7 +6615,7 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-parachains"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "bitvec",
  "derive_more",
@@ -6459,7 +6623,7 @@ dependencies = [
  "frame-support",
  "frame-support-test",
  "frame-system",
- "futures 0.3.14",
+ "futures 0.3.15",
  "hex-literal",
  "libsecp256k1",
  "log",
@@ -6502,14 +6666,13 @@ dependencies = [
 
 [[package]]
 name = "polkadot-service"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "beefy-gadget",
  "beefy-primitives",
  "env_logger 0.8.2",
- "frame-benchmarking",
  "frame-system-rpc-runtime-api",
- "futures 0.3.14",
+ "futures 0.3.15",
  "hex-literal",
  "kusama-runtime",
  "kvdb",
@@ -6523,6 +6686,7 @@ dependencies = [
  "polkadot-availability-bitfield-distribution",
  "polkadot-availability-distribution",
  "polkadot-availability-recovery",
+ "polkadot-client",
  "polkadot-collator-protocol",
  "polkadot-gossip-support",
  "polkadot-network-bridge",
@@ -6531,7 +6695,6 @@ dependencies = [
  "polkadot-node-core-av-store",
  "polkadot-node-core-backing",
  "polkadot-node-core-bitfield-signing",
- "polkadot-node-core-candidate-selection",
  "polkadot-node-core-candidate-validation",
  "polkadot-node-core-chain-api",
  "polkadot-node-core-parachains-inherent",
@@ -6599,7 +6762,7 @@ version = "0.1.0"
 dependencies = [
  "arrayvec 0.5.2",
  "assert_matches",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "indexmap",
  "parity-scale-codec",
@@ -6623,7 +6786,7 @@ dependencies = [
 
 [[package]]
 name = "polkadot-statement-table"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
@@ -6632,9 +6795,9 @@ dependencies = [
 
 [[package]]
 name = "polkadot-test-client"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "parity-scale-codec",
  "polkadot-node-subsystem",
  "polkadot-primitives",
@@ -6658,7 +6821,7 @@ dependencies = [
 
 [[package]]
 name = "polkadot-test-runtime"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -6720,12 +6883,12 @@ dependencies = [
 
 [[package]]
 name = "polkadot-test-service"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "frame-benchmarking",
  "frame-system",
  "futures 0.1.29",
- "futures 0.3.14",
+ "futures 0.3.15",
  "hex",
  "pallet-balances",
  "pallet-staking",
@@ -6848,6 +7011,18 @@ dependencies = [
  "output_vt100",
 ]
 
+[[package]]
+name = "pretty_assertions"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cab0e7c02cf376875e9335e0ba1da535775beb5450d21e1dffca068818ed98b"
+dependencies = [
+ "ansi_term 0.12.1",
+ "ctor",
+ "diff",
+ "output_vt100",
+]
+
 [[package]]
 name = "primitive-types"
 version = "0.9.0"
@@ -7001,13 +7176,13 @@ dependencies = [
 
 [[package]]
 name = "pwasm-utils"
-version = "0.14.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f53bc2558e8376358ebdc28301546471d67336584f6438ed4b7c7457a055fd7"
+checksum = "a0e517f47d9964362883182404b68d0b6949382c0baa40aa5ffca94f5f1e3481"
 dependencies = [
  "byteorder",
  "log",
- "parity-wasm 0.41.0",
+ "parity-wasm 0.42.2",
 ]
 
 [[package]]
@@ -7350,14 +7525,16 @@ dependencies = [
 [[package]]
 name = "remote-externalities"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "env_logger 0.8.2",
- "hex-literal",
- "jsonrpsee-http-client",
+ "hex",
  "jsonrpsee-proc-macros",
+ "jsonrpsee-ws-client",
  "log",
  "parity-scale-codec",
+ "serde",
+ "serde_json",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -7384,9 +7561,9 @@ dependencies = [
 
 [[package]]
 name = "retain_mut"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53552c6c49e1e13f1a203ef0080ab3bbef0beb570a528993e83df057a9d9bba1"
+checksum = "e9c17925a9027d298a4603d286befe3f9dc0e8ed02523141914eb628798d6e5b"
 
 [[package]]
 name = "ring"
@@ -7425,7 +7602,7 @@ dependencies = [
 
 [[package]]
 name = "rococo-runtime"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "beefy-primitives",
  "bp-rococo",
@@ -7436,6 +7613,7 @@ dependencies = [
  "frame-system-rpc-runtime-api",
  "hex-literal",
  "log",
+ "max-encoded-len",
  "pallet-authority-discovery",
  "pallet-authorship",
  "pallet-babe",
@@ -7552,9 +7730,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.19.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "064fd21ff87c6e87ed4506e68beb42459caa4a0e2eb144932e6776768556980b"
+checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
 dependencies = [
  "base64 0.13.0",
  "log",
@@ -7572,7 +7750,19 @@ dependencies = [
  "openssl-probe",
  "rustls 0.18.0",
  "schannel",
- "security-framework",
+ "security-framework 1.0.0",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
+dependencies = [
+ "openssl-probe",
+ "rustls 0.19.1",
+ "schannel",
+ "security-framework 2.2.0",
 ]
 
 [[package]]
@@ -7597,7 +7787,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "pin-project 0.4.23",
  "static_assertions",
 ]
@@ -7638,12 +7828,12 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "async-trait",
  "derive_more",
  "either",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "ip_network",
  "libp2p",
@@ -7667,9 +7857,9 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -7690,7 +7880,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -7706,7 +7896,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7727,7 +7917,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -7738,11 +7928,11 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "chrono",
  "fdlimit",
- "futures 0.3.14",
+ "futures 0.3.15",
  "hex",
  "libp2p",
  "log",
@@ -7776,11 +7966,11 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "derive_more",
  "fnv",
- "futures 0.3.14",
+ "futures 0.3.15",
  "hash-db",
  "kvdb",
  "lazy_static",
@@ -7810,7 +8000,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -7840,7 +8030,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "parking_lot 0.11.1",
  "sc-client-api",
@@ -7852,12 +8042,12 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "async-trait",
  "derive_more",
  "fork-tree",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "log",
  "merlin",
@@ -7898,10 +8088,10 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "derive_more",
- "futures 0.3.14",
+ "futures 0.3.15",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -7922,7 +8112,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -7935,10 +8125,10 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "async-trait",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "impl-trait-for-tuples",
  "log",
@@ -7963,7 +8153,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "sc-client-api",
  "sp-authorship",
@@ -7974,14 +8164,14 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "derive_more",
  "lazy_static",
  "libsecp256k1",
  "log",
  "parity-scale-codec",
- "parity-wasm 0.41.0",
+ "parity-wasm 0.42.2",
  "parking_lot 0.11.1",
  "sc-executor-common",
  "sc-executor-wasmi",
@@ -8003,11 +8193,10 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "derive_more",
  "parity-scale-codec",
- "parity-wasm 0.41.0",
  "pwasm-utils",
  "sp-allocator",
  "sp-core",
@@ -8021,7 +8210,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8036,12 +8225,13 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
  "log",
  "parity-scale-codec",
- "parity-wasm 0.41.0",
- "pwasm-utils",
+ "parity-wasm 0.42.2",
  "sc-executor-common",
  "scoped-tls",
  "sp-allocator",
@@ -8054,20 +8244,20 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "async-trait",
  "derive_more",
  "dyn-clone",
  "finality-grandpa",
  "fork-tree",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "linked-hash-map",
  "log",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "pin-project 1.0.4",
+ "pin-project 1.0.7",
  "rand 0.7.3",
  "sc-block-builder",
  "sc-client-api",
@@ -8089,16 +8279,17 @@ dependencies = [
  "sp-runtime",
  "sp-utils",
  "substrate-prometheus-endpoint",
+ "wasm-timer",
 ]
 
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "derive_more",
  "finality-grandpa",
- "futures 0.3.14",
+ "futures 0.3.15",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -8118,10 +8309,10 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-warp-sync"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "derive_more",
- "futures 0.3.14",
+ "futures 0.3.15",
  "log",
  "num-traits",
  "parity-scale-codec",
@@ -8139,10 +8330,11 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "ansi_term 0.12.1",
- "futures 0.3.14",
+ "futures 0.3.15",
+ "futures-timer 3.0.2",
  "log",
  "parity-util-mem",
  "sc-client-api",
@@ -8150,18 +8342,17 @@ dependencies = [
  "sp-blockchain",
  "sp-runtime",
  "sp-transaction-pool",
- "sp-utils",
  "wasm-timer",
 ]
 
 [[package]]
 name = "sc-keystore"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "async-trait",
  "derive_more",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-util",
  "hex",
  "merlin",
@@ -8177,7 +8368,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -8196,7 +8387,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "async-std",
  "async-trait",
@@ -8210,7 +8401,7 @@ dependencies = [
  "erased-serde",
  "fnv",
  "fork-tree",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "hex",
  "ip_network",
@@ -8222,7 +8413,7 @@ dependencies = [
  "nohash-hasher",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "pin-project 1.0.4",
+ "pin-project 1.0.7",
  "prost",
  "prost-build",
  "rand 0.7.3",
@@ -8249,9 +8440,9 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -8266,11 +8457,11 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "hex",
  "hyper 0.13.9",
@@ -8294,9 +8485,9 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "libp2p",
  "log",
  "serde_json",
@@ -8307,7 +8498,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -8316,9 +8507,9 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "hash-db",
  "jsonrpc-core",
  "jsonrpc-pubsub",
@@ -8351,10 +8542,10 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "derive_more",
- "futures 0.3.14",
+ "futures 0.3.15",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -8376,7 +8567,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "futures 0.1.29",
  "jsonrpc-core",
@@ -8394,13 +8585,13 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "async-trait",
  "directories",
  "exit-future",
  "futures 0.1.29",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "hash-db",
  "jsonrpc-core",
@@ -8410,7 +8601,7 @@ dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
  "parking_lot 0.11.1",
- "pin-project 1.0.4",
+ "pin-project 1.0.7",
  "rand 0.7.3",
  "sc-block-builder",
  "sc-chain-spec",
@@ -8444,6 +8635,7 @@ dependencies = [
  "sp-state-machine",
  "sp-tracing",
  "sp-transaction-pool",
+ "sp-transaction-storage-proof",
  "sp-trie",
  "sp-utils",
  "sp-version",
@@ -8458,7 +8650,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8473,7 +8665,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -8493,14 +8685,14 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "chrono",
- "futures 0.3.14",
+ "futures 0.3.15",
  "libp2p",
  "log",
  "parking_lot 0.11.1",
- "pin-project 1.0.4",
+ "pin-project 1.0.7",
  "rand 0.7.3",
  "serde",
  "serde_json",
@@ -8513,7 +8705,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -8550,7 +8742,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -8561,10 +8753,10 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "derive_more",
- "futures 0.3.14",
+ "futures 0.3.15",
  "linked-hash-map",
  "log",
  "parity-util-mem",
@@ -8583,10 +8775,9 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
- "futures 0.3.14",
- "futures-diagnose",
+ "futures 0.3.15",
  "intervalier",
  "log",
  "parity-scale-codec",
@@ -8629,7 +8820,6 @@ dependencies = [
  "merlin",
  "rand 0.7.3",
  "rand_core 0.5.1",
- "serde",
  "sha2 0.8.2",
  "subtle 2.2.3",
  "zeroize",
@@ -8693,10 +8883,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad502866817f0575705bd7be36e2b2535cc33262d493aa733a2ec862baa2bc2b"
 dependencies = [
  "bitflags",
- "core-foundation",
- "core-foundation-sys",
+ "core-foundation 0.7.0",
+ "core-foundation-sys 0.7.0",
+ "libc",
+ "security-framework-sys 1.0.0",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84"
+dependencies = [
+ "bitflags",
+ "core-foundation 0.9.1",
+ "core-foundation-sys 0.8.2",
  "libc",
- "security-framework-sys",
+ "security-framework-sys 2.2.0",
 ]
 
 [[package]]
@@ -8705,7 +8908,17 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51ceb04988b17b6d1dcd555390fa822ca5637b4a14e1f5099f13d351bed4d6c7"
 dependencies = [
- "core-foundation-sys",
+ "core-foundation-sys 0.7.0",
+ "libc",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3676258fd3cfe2c9a0ec99ce3038798d847ce3e4bb17746373eb9f0f1ac16339"
+dependencies = [
+ "core-foundation-sys 0.8.2",
  "libc",
 ]
 
@@ -8733,7 +8946,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
 dependencies = [
- "semver-parser 0.10.0",
+ "semver-parser 0.10.2",
  "serde",
 ]
 
@@ -8745,12 +8958,11 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "semver-parser"
-version = "0.10.0"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e012c6c5380fb91897ba7b9261a0f565e624e869d42fe1a1d03fa0d68a083d5"
+checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
 dependencies = [
  "pest",
- "pest_derive",
 ]
 
 [[package]]
@@ -8773,18 +8985,18 @@ checksum = "f97841a747eef040fcd2e7b3b9a220a7205926e60488e673d9e4926d27772ce5"
 
 [[package]]
 name = "serde"
-version = "1.0.125"
+version = "1.0.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
+checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.125"
+version = "1.0.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
+checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8814,6 +9026,19 @@ dependencies = [
  "opaque-debug 0.2.3",
 ]
 
+[[package]]
+name = "sha-1"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c4cfa741c5832d0ef7fab46cabed29c2aae926db0b11bb2069edd8db5e64e16"
+dependencies = [
+ "block-buffer 0.9.0",
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "digest 0.9.0",
+ "opaque-debug 0.3.0",
+]
+
 [[package]]
 name = "sha2"
 version = "0.8.2"
@@ -8922,7 +9147,7 @@ dependencies = [
 
 [[package]]
 name = "slot-range-helper"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "enumn",
  "parity-scale-codec",
@@ -9004,17 +9229,32 @@ dependencies = [
  "base64 0.12.3",
  "bytes 0.5.6",
  "flate2",
- "futures 0.3.14",
+ "futures 0.3.15",
  "httparse",
  "log",
  "rand 0.7.3",
- "sha-1",
+ "sha-1 0.8.2",
+]
+
+[[package]]
+name = "soketto"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4919971d141dbadaa0e82b5d369e2d7666c98e4625046140615ca363e50d4daa"
+dependencies = [
+ "base64 0.13.0",
+ "bytes 1.0.1",
+ "futures 0.3.15",
+ "httparse",
+ "log",
+ "rand 0.8.3",
+ "sha-1 0.9.6",
 ]
 
 [[package]]
 name = "sp-allocator"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "log",
  "sp-core",
@@ -9026,7 +9266,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "hash-db",
  "log",
@@ -9043,7 +9283,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate 1.0.0",
@@ -9055,8 +9295,9 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
+ "max-encoded-len",
  "parity-scale-codec",
  "serde",
  "sp-core",
@@ -9067,7 +9308,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -9081,7 +9322,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9093,7 +9334,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -9105,7 +9346,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9117,9 +9358,9 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "log",
  "lru",
  "parity-scale-codec",
@@ -9135,7 +9376,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "serde",
  "serde_json",
@@ -9144,10 +9385,10 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "async-trait",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -9171,7 +9412,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "async-trait",
  "merlin",
@@ -9193,7 +9434,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "parity-scale-codec",
  "sp-arithmetic",
@@ -9203,7 +9444,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -9215,14 +9456,14 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "base58",
  "blake2-rfc",
  "byteorder",
  "dyn-clonable",
  "ed25519-dalek",
- "futures 0.3.14",
+ "futures 0.3.15",
  "hash-db",
  "hash256-std-hasher",
  "hex",
@@ -9230,6 +9471,7 @@ dependencies = [
  "lazy_static",
  "libsecp256k1",
  "log",
+ "max-encoded-len",
  "merlin",
  "num-traits",
  "parity-scale-codec",
@@ -9259,7 +9501,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -9268,7 +9510,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9278,7 +9520,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -9289,7 +9531,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -9306,7 +9548,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -9320,9 +9562,9 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "hash-db",
  "libsecp256k1",
  "log",
@@ -9345,7 +9587,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -9356,11 +9598,11 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "async-trait",
  "derive_more",
- "futures 0.3.14",
+ "futures 0.3.15",
  "merlin",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -9373,7 +9615,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "ruzstd",
  "zstd",
@@ -9382,7 +9624,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -9395,7 +9637,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -9406,7 +9648,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -9416,7 +9658,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "backtrace",
 ]
@@ -9424,7 +9666,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -9435,12 +9677,13 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "either",
  "hash256-std-hasher",
  "impl-trait-for-tuples",
  "log",
+ "max-encoded-len",
  "parity-scale-codec",
  "parity-util-mem",
  "paste 1.0.4",
@@ -9456,7 +9699,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -9473,7 +9716,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.0.0",
@@ -9485,7 +9728,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "serde",
  "serde_json",
@@ -9494,7 +9737,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9507,7 +9750,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -9517,7 +9760,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "hash-db",
  "log",
@@ -9540,12 +9783,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 
 [[package]]
 name = "sp-storage"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9558,7 +9801,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "log",
  "sp-core",
@@ -9571,7 +9814,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "async-trait",
  "futures-timer 3.0.2",
@@ -9588,7 +9831,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "erased-serde",
  "log",
@@ -9606,10 +9849,10 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "derive_more",
- "futures 0.3.14",
+ "futures 0.3.15",
  "log",
  "parity-scale-codec",
  "serde",
@@ -9619,10 +9862,25 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "sp-transaction-storage-proof"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
+dependencies = [
+ "async-trait",
+ "log",
+ "parity-scale-codec",
+ "sp-core",
+ "sp-inherents",
+ "sp-runtime",
+ "sp-std",
+ "sp-trie",
+]
+
 [[package]]
 name = "sp-trie"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -9636,9 +9894,9 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-core",
  "futures-timer 3.0.2",
  "lazy_static",
@@ -9648,7 +9906,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9661,7 +9919,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "parity-scale-codec",
  "proc-macro-crate 1.0.0",
@@ -9673,7 +9931,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -9830,12 +10088,12 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
  "futures 0.1.29",
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "getrandom 0.2.1",
  "js-sys",
@@ -9856,7 +10114,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "platforms",
 ]
@@ -9864,10 +10122,10 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-system-rpc-runtime-api",
- "futures 0.3.14",
+ "futures 0.3.15",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -9887,7 +10145,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "async-std",
  "derive_more",
@@ -9901,11 +10159,11 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "async-trait",
  "futures 0.1.29",
- "futures 0.3.14",
+ "futures 0.3.15",
  "hash-db",
  "hex",
  "parity-scale-codec",
@@ -9930,9 +10188,9 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "substrate-test-utils-derive",
  "tokio 0.2.21",
 ]
@@ -9940,7 +10198,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "quote",
@@ -10012,9 +10270,9 @@ checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e"
 
 [[package]]
 name = "target-lexicon"
-version = "0.11.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee5a98e506fb7231a304c3a1bd7c132a55016cf65001e0282480665870dfcb9"
+checksum = "64ae3b39281e4b14b8123bdbaddd472b7dfe215e444181f2f9d2443c2444f834"
 
 [[package]]
 name = "tempfile"
@@ -10041,7 +10299,7 @@ dependencies = [
 
 [[package]]
 name = "test-parachain-adder"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "dlmalloc",
  "parity-scale-codec",
@@ -10054,9 +10312,9 @@ dependencies = [
 
 [[package]]
 name = "test-parachain-adder-collator"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
@@ -10081,14 +10339,14 @@ dependencies = [
 
 [[package]]
 name = "test-parachain-halt"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "substrate-wasm-builder",
 ]
 
 [[package]]
 name = "test-parachains"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "parity-scale-codec",
  "polkadot-parachain",
@@ -10263,6 +10521,16 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "tokio"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a38d31d7831c6ed7aad00aa4c12d9375fd225a6dd77da1d25b707346319a975"
+dependencies = [
+ "autocfg",
+ "pin-project-lite 0.2.4",
+]
+
 [[package]]
 name = "tokio-buf"
 version = "0.1.1"
@@ -10382,6 +10650,18 @@ dependencies = [
  "webpki",
 ]
 
+[[package]]
+name = "tokio-rustls"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03d15e5669243a45f630a5167d101b942174ca94b615445b2057eace1c818736"
+dependencies = [
+ "futures-core",
+ "rustls 0.19.1",
+ "tokio 0.2.21",
+ "webpki",
+]
+
 [[package]]
 name = "tokio-service"
 version = "0.1.0"
@@ -10485,6 +10765,7 @@ checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
 dependencies = [
  "bytes 0.5.6",
  "futures-core",
+ "futures-io",
  "futures-sink",
  "log",
  "pin-project-lite 0.1.7",
@@ -10508,9 +10789,9 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
 
 [[package]]
 name = "tracing"
-version = "0.1.25"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f"
+checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
 dependencies = [
  "cfg-if 1.0.0",
  "log",
@@ -10521,9 +10802,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41768be5b9f3489491825f56f01f25290aa1d3e7cc97e182d4d34360493ba6fa"
+checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10532,23 +10813,13 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f"
+checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052"
 dependencies = [
  "lazy_static",
 ]
 
-[[package]]
-name = "tracing-error"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4d7c0b83d4a500748fa5879461652b361edf5c9d51ede2a2ac03875ca185e24"
-dependencies = [
- "tracing",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "tracing-futures"
 version = "0.2.4"
@@ -10561,9 +10832,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-log"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e0f8c7178e13481ff6765bd169b33e8d554c5d2bbede5e32c356194be02b9b9"
+checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3"
 dependencies = [
  "lazy_static",
  "log",
@@ -10582,9 +10853,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.2.15"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1fa8f0c8f4c594e4fc9debc1990deab13238077271ba84dd853d54902ee3401"
+checksum = "aa5553bf0883ba7c9cbe493b085c29926bd41b66afc31ff72cf17ff4fb60dcd5"
 dependencies = [
  "ansi_term 0.12.1",
  "chrono",
@@ -10682,20 +10953,23 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 [[package]]
 name = "try-runtime-cli"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#c0be5844f0b44f9f54fb802cef98fa5fdf561c28"
+source = "git+https://github.com/paritytech/substrate#f88f4edbc42b76053404f9ba45d641dafb147ab7"
 dependencies = [
  "frame-try-runtime",
  "log",
  "parity-scale-codec",
  "remote-externalities",
+ "sc-chain-spec",
  "sc-cli",
  "sc-client-api",
  "sc-executor",
  "sc-service",
+ "serde",
  "sp-api",
  "sp-blockchain",
  "sp-core",
  "sp-externalities",
+ "sp-keystore",
  "sp-runtime",
  "sp-state-machine",
  "structopt",
@@ -10703,9 +10977,9 @@ dependencies = [
 
 [[package]]
 name = "trybuild"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99471a206425fba51842a9186315f32d91c56eadc21ea4c21f847b59cf778f8b"
+checksum = "1768998d9a3b179411618e377dbb134c58a88cda284b0aa71c42c40660127d46"
 dependencies = [
  "glob",
  "lazy_static",
@@ -10991,9 +11265,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.19"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35"
+checksum = "81b8b767af23de6ac18bf2168b690bed2902743ddf0fb39252e36f9e2bfc63ea"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -11047,7 +11321,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "js-sys",
  "parking_lot 0.11.1",
  "pin-utils",
@@ -11058,38 +11332,39 @@ dependencies = [
 
 [[package]]
 name = "wasmi"
-version = "0.6.2"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf617d864d25af3587aa745529f7aaa541066c876d57e050c0d0c85c61c92aff"
+checksum = "d2ee05bba3d1d994652079893941a2ef9324d2b58a63c31b40678fb7eddd7a5a"
 dependencies = [
+ "downcast-rs",
  "libc",
  "memory_units",
  "num-rational",
  "num-traits",
- "parity-wasm 0.41.0",
+ "parity-wasm 0.42.2",
  "wasmi-validation",
 ]
 
 [[package]]
 name = "wasmi-validation"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea78c597064ba73596099281e2f4cfc019075122a65cdda3205af94f0b264d93"
+checksum = "a2eb8e860796d8be48efef530b60eebf84e74a88bce107374fffb0da97d504b8"
 dependencies = [
- "parity-wasm 0.41.0",
+ "parity-wasm 0.42.2",
 ]
 
 [[package]]
 name = "wasmparser"
-version = "0.76.0"
+version = "0.78.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "755a9a4afe3f6cccbbe6d7e965eef44cf260b001f93e547eba84255c1d0187d8"
+checksum = "52144d4c78e5cf8b055ceab8e5fa22814ce4315d6002ad32cfd914f37c12fd65"
 
 [[package]]
 name = "wasmtime"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718cb52a9fdb7ab12471e9b9d051c9adfa6b5c504e0a1fea045e5eabc81eedd9"
+checksum = "b310b9d20fcf59385761d1ade7a3ef06aecc380e3d3172035b919eaf7465d9f7"
 dependencies = [
  "anyhow",
  "backtrace",
@@ -11097,9 +11372,11 @@ dependencies = [
  "cfg-if 1.0.0",
  "cpp_demangle",
  "indexmap",
+ "lazy_static",
  "libc",
  "log",
  "paste 1.0.4",
+ "psm",
  "region",
  "rustc-demangle",
  "serde",
@@ -11118,9 +11395,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-cache"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f984df56c4adeba91540f9052db9f7a8b3b00cfaac1a023bee50a972f588b0c"
+checksum = "d14d500d5c3dc5f5c097158feee123d64b3097f0d836a2a27dff9c761c73c843"
 dependencies = [
  "anyhow",
  "base64 0.13.0",
@@ -11139,28 +11416,29 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-cranelift"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a05abbf94e03c2c8ee02254b1949320c4d45093de5d9d6ed4d9351d536075c9"
+checksum = "c525b39f062eada7db3c1298287b96dcb6e472b9f6b22501300b28d9fa7582f6"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
  "cranelift-frontend",
  "cranelift-wasm",
+ "target-lexicon",
  "wasmparser",
  "wasmtime-environ",
 ]
 
 [[package]]
 name = "wasmtime-debug"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "382eecd6281c6c1d1f3c904c3c143e671fc1a9573820cbfa777fba45ce2eda9c"
+checksum = "c5d2a763e7a6fc734218e0e463196762a4f409c483063d81e0e85f96343b2e0a"
 dependencies = [
  "anyhow",
- "gimli",
+ "gimli 0.24.0",
  "more-asserts",
- "object",
+ "object 0.24.0",
  "target-lexicon",
  "thiserror",
  "wasmparser",
@@ -11169,16 +11447,15 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-environ"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81011b2b833663d7e0ce34639459a0e301e000fc7331e0298b3a27c78d0cec60"
+checksum = "f64d0c2d881c31b0d65c1f2695e022d71eb60b9fbdd336aacca28208b58eac90"
 dependencies = [
- "anyhow",
  "cfg-if 1.0.0",
  "cranelift-codegen",
  "cranelift-entity",
  "cranelift-wasm",
- "gimli",
+ "gimli 0.24.0",
  "indexmap",
  "log",
  "more-asserts",
@@ -11189,9 +11466,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-fiber"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d92da32e31af2e3d828f485f5f24651ed4d3b7f03a46ea6555eae6940d1402cd"
+checksum = "a089d44cd7e2465d41a53b840a5b4fca1bf6d1ecfebc970eac9592b34ea5f0b3"
 dependencies = [
  "cc",
  "libc",
@@ -11200,11 +11477,11 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-jit"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b5f649623859a12d361fe4cc4793de44f7c3ff34c322c5714289787e89650bb"
+checksum = "4d4539ea734422b7c868107e2187d7746d8affbcaa71916d72639f53757ad707"
 dependencies = [
- "addr2line",
+ "addr2line 0.15.1",
  "anyhow",
  "cfg-if 1.0.0",
  "cranelift-codegen",
@@ -11212,10 +11489,10 @@ dependencies = [
  "cranelift-frontend",
  "cranelift-native",
  "cranelift-wasm",
- "gimli",
+ "gimli 0.24.0",
  "log",
  "more-asserts",
- "object",
+ "object 0.24.0",
  "rayon",
  "region",
  "serde",
@@ -11233,13 +11510,13 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-obj"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2e99cd9858f57fd062e9351e07881cedfc8597928385e02a48d9333b9e15a1"
+checksum = "8e1a8ff85246d091828e2225af521a6208ed28c997bb5c39eb697366dc2e2f2b"
 dependencies = [
  "anyhow",
  "more-asserts",
- "object",
+ "object 0.24.0",
  "target-lexicon",
  "wasmtime-debug",
  "wasmtime-environ",
@@ -11247,16 +11524,16 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-profiling"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e46c0a590e49278ba7f79ef217af9db4ecc671b50042c185093e22d73524abb2"
+checksum = "e24364d522dcd67c897c8fffc42e5bdfc57207bbb6d7eeade0da9d4a7d70105b"
 dependencies = [
  "anyhow",
  "cfg-if 1.0.0",
- "gimli",
+ "gimli 0.24.0",
  "lazy_static",
  "libc",
- "object",
+ "object 0.24.0",
  "scroll",
  "serde",
  "target-lexicon",
@@ -11266,10 +11543,11 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-runtime"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1438a09185fc7ca067caf1a80d7e5b398eefd4fb7630d94841448ade60feb3d0"
+checksum = "c51e57976e8a19a18a18e002c6eb12e5769554204238e47ff155fda1809ef0f7"
 dependencies = [
+ "anyhow",
  "backtrace",
  "cc",
  "cfg-if 1.0.0",
@@ -11277,12 +11555,14 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
+ "mach",
  "memoffset 0.6.1",
  "more-asserts",
- "psm",
+ "rand 0.8.3",
  "region",
  "thiserror",
  "wasmtime-environ",
+ "wasmtime-fiber",
  "winapi 0.3.9",
 ]
 
@@ -11344,11 +11624,12 @@ dependencies = [
 
 [[package]]
 name = "westend-runtime"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "beefy-primitives",
  "bitvec",
  "frame-benchmarking",
+ "frame-election-provider-support",
  "frame-executive",
  "frame-support",
  "frame-system",
@@ -11358,6 +11639,7 @@ dependencies = [
  "hex-literal",
  "libsecp256k1",
  "log",
+ "max-encoded-len",
  "pallet-authority-discovery",
  "pallet-authorship",
  "pallet-babe",
@@ -11536,7 +11818,7 @@ dependencies = [
 
 [[package]]
 name = "xcm"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "derivative",
  "impl-trait-for-tuples",
@@ -11545,7 +11827,7 @@ dependencies = [
 
 [[package]]
 name = "xcm-builder"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -11563,7 +11845,7 @@ dependencies = [
 
 [[package]]
 name = "xcm-executor"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -11583,7 +11865,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107"
 dependencies = [
- "futures 0.3.14",
+ "futures 0.3.15",
  "log",
  "nohash-hasher",
  "parking_lot 0.11.1",
diff --git a/bridges/bin/millau/node/Cargo.toml b/bridges/bin/millau/node/Cargo.toml
index 4c5f081e1506..3ea614730454 100644
--- a/bridges/bin/millau/node/Cargo.toml
+++ b/bridges/bin/millau/node/Cargo.toml
@@ -24,35 +24,35 @@ pallet-bridge-messages = { path = "../../../modules/messages" }
 
 # Substrate Dependencies
 
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
-node-inspect = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["wasmtime"] }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" }
-substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+node-inspect = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-cli = { git = "https://github.com/paritytech/substrate", features = ["wasmtime"] , branch = "shawntabrizi-v0.8.31" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 [build-dependencies]
 substrate-build-script-utils = "3.0.0"
-frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 [features]
 default = []
diff --git a/bridges/bin/millau/runtime/Cargo.toml b/bridges/bin/millau/runtime/Cargo.toml
index 240b079d110f..b8d98e621092 100644
--- a/bridges/bin/millau/runtime/Cargo.toml
+++ b/bridges/bin/millau/runtime/Cargo.toml
@@ -28,32 +28,32 @@ pallet-shift-session-manager = { path = "../../../modules/shift-session-manager"
 
 # Substrate Dependencies
 
-frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [build-dependencies]
 substrate-wasm-builder = "3.0.0"
diff --git a/bridges/bin/rialto/node/Cargo.toml b/bridges/bin/rialto/node/Cargo.toml
index 38272cd8c786..e4c765762084 100644
--- a/bridges/bin/rialto/node/Cargo.toml
+++ b/bridges/bin/rialto/node/Cargo.toml
@@ -25,35 +25,35 @@ rialto-runtime = { path = "../runtime" }
 # Substrate Dependencies
 
 
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
-node-inspect = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["wasmtime"] }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" }
-substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+node-inspect = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-cli = { git = "https://github.com/paritytech/substrate", features = ["wasmtime"] , branch = "shawntabrizi-v0.8.31" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 [build-dependencies]
 substrate-build-script-utils = "3.0.0"
-frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 [features]
 default = []
diff --git a/bridges/bin/rialto/runtime/Cargo.toml b/bridges/bin/rialto/runtime/Cargo.toml
index 63a48a255bd4..f1ad39d56929 100644
--- a/bridges/bin/rialto/runtime/Cargo.toml
+++ b/bridges/bin/rialto/runtime/Cargo.toml
@@ -34,34 +34,34 @@ pallet-shift-session-manager = { path = "../../../modules/shift-session-manager"
 
 # Substrate Dependencies
 
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true }
-frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
+frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 
 [dev-dependencies]
diff --git a/bridges/bin/runtime-common/Cargo.toml b/bridges/bin/runtime-common/Cargo.toml
index 83803d06deb5..353c0fec9341 100644
--- a/bridges/bin/runtime-common/Cargo.toml
+++ b/bridges/bin/runtime-common/Cargo.toml
@@ -23,12 +23,12 @@ pallet-bridge-messages = { path = "../../modules/messages", default-features = f
 
 # Substrate dependencies
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [features]
 default = ["std"]
diff --git a/bridges/fuzz/storage-proof/Cargo.toml b/bridges/fuzz/storage-proof/Cargo.toml
index 05456114e6b2..1aa7208e2e64 100644
--- a/bridges/fuzz/storage-proof/Cargo.toml
+++ b/bridges/fuzz/storage-proof/Cargo.toml
@@ -23,12 +23,12 @@ bp-test-utils = { path = "../../primitives/test-utils" }
 
 # Substrate Dependencies
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
diff --git a/bridges/modules/currency-exchange/Cargo.toml b/bridges/modules/currency-exchange/Cargo.toml
index 8094f0f2b6ee..1b3646a1d95d 100644
--- a/bridges/modules/currency-exchange/Cargo.toml
+++ b/bridges/modules/currency-exchange/Cargo.toml
@@ -18,15 +18,15 @@ bp-header-chain = { path = "../../primitives/header-chain", default-features = f
 
 # Substrate Dependencies
 
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 [features]
 default = ["std"]
diff --git a/bridges/modules/dispatch/Cargo.toml b/bridges/modules/dispatch/Cargo.toml
index 6170af272ad9..0c0030ee4fce 100644
--- a/bridges/modules/dispatch/Cargo.toml
+++ b/bridges/modules/dispatch/Cargo.toml
@@ -17,14 +17,14 @@ bp-runtime = { path = "../../primitives/runtime", default-features = false }
 
 # Substrate Dependencies
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 serde = "1.0"
 
 [features]
diff --git a/bridges/modules/ethereum-contract-builtin/Cargo.toml b/bridges/modules/ethereum-contract-builtin/Cargo.toml
index 82e287a3abdc..1aac5abc1ee4 100644
--- a/bridges/modules/ethereum-contract-builtin/Cargo.toml
+++ b/bridges/modules/ethereum-contract-builtin/Cargo.toml
@@ -19,10 +19,10 @@ rialto-runtime = { path = "../../bin/rialto/runtime" }
 
 # Substrate Dependencies
 
-sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
diff --git a/bridges/modules/ethereum/Cargo.toml b/bridges/modules/ethereum/Cargo.toml
index fdd93ed73311..c6607c3ee94b 100644
--- a/bridges/modules/ethereum/Cargo.toml
+++ b/bridges/modules/ethereum/Cargo.toml
@@ -18,12 +18,12 @@ bp-eth-poa = { path = "../../primitives/ethereum-poa", default-features = false
 
 # Substrate Dependencies
 
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [dev-dependencies]
 libsecp256k1 = { version = "0.3.4", features = ["hmac"] }
diff --git a/bridges/modules/grandpa/Cargo.toml b/bridges/modules/grandpa/Cargo.toml
index 810dce3dd5a4..842685244cac 100644
--- a/bridges/modules/grandpa/Cargo.toml
+++ b/bridges/modules/grandpa/Cargo.toml
@@ -21,19 +21,19 @@ bp-header-chain = { path = "../../primitives/header-chain", default-features = f
 
 # Substrate Dependencies
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 # Optional Benchmarking Dependencies
 bp-test-utils = { path = "../../primitives/test-utils", default-features = false, optional = true }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 [features]
 default = ["std"]
diff --git a/bridges/modules/messages/Cargo.toml b/bridges/modules/messages/Cargo.toml
index 4a75fa8181f8..640498e7e062 100644
--- a/bridges/modules/messages/Cargo.toml
+++ b/bridges/modules/messages/Cargo.toml
@@ -20,18 +20,18 @@ bp-runtime = { path = "../../primitives/runtime", default-features = false }
 
 # Substrate Dependencies
 
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [dev-dependencies]
 hex = "0.4"
 hex-literal = "0.3"
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 [features]
 default = ["std"]
diff --git a/bridges/modules/shift-session-manager/Cargo.toml b/bridges/modules/shift-session-manager/Cargo.toml
index 6dac97ddde60..1337a49bae9e 100644
--- a/bridges/modules/shift-session-manager/Cargo.toml
+++ b/bridges/modules/shift-session-manager/Cargo.toml
@@ -11,15 +11,15 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 
 # Substrate Dependencies
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 serde = "1.0"
 
 [features]
diff --git a/bridges/primitives/chain-kusama/Cargo.toml b/bridges/primitives/chain-kusama/Cargo.toml
index 70ff3b844df0..00b58cccffb2 100644
--- a/bridges/primitives/chain-kusama/Cargo.toml
+++ b/bridges/primitives/chain-kusama/Cargo.toml
@@ -14,8 +14,8 @@ bp-polkadot-core = { path = "../polkadot-core", default-features = false }
 bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Based Dependencies
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/chain-millau/Cargo.toml b/bridges/primitives/chain-millau/Cargo.toml
index 67db08c20860..6f3b0adf6c81 100644
--- a/bridges/primitives/chain-millau/Cargo.toml
+++ b/bridges/primitives/chain-millau/Cargo.toml
@@ -21,14 +21,14 @@ serde = { version = "1.0.101", optional = true, features = ["derive"] }
 
 # Substrate Based Dependencies
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/chain-polkadot/Cargo.toml b/bridges/primitives/chain-polkadot/Cargo.toml
index 22ded41b9145..cc45620d62d1 100644
--- a/bridges/primitives/chain-polkadot/Cargo.toml
+++ b/bridges/primitives/chain-polkadot/Cargo.toml
@@ -15,8 +15,8 @@ bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Based Dependencies
 
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/chain-rialto/Cargo.toml b/bridges/primitives/chain-rialto/Cargo.toml
index 7e039a40acd9..1e43a20011fc 100644
--- a/bridges/primitives/chain-rialto/Cargo.toml
+++ b/bridges/primitives/chain-rialto/Cargo.toml
@@ -15,12 +15,12 @@ bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Based Dependencies
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/chain-rococo/Cargo.toml b/bridges/primitives/chain-rococo/Cargo.toml
index b97e8d9d1ab1..3f23da1f201a 100644
--- a/bridges/primitives/chain-rococo/Cargo.toml
+++ b/bridges/primitives/chain-rococo/Cargo.toml
@@ -16,10 +16,10 @@ bp-polkadot-core = { path = "../polkadot-core", default-features = false }
 bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Based Dependencies
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/chain-westend/Cargo.toml b/bridges/primitives/chain-westend/Cargo.toml
index d5fda1ccef05..9296a08ade77 100644
--- a/bridges/primitives/chain-westend/Cargo.toml
+++ b/bridges/primitives/chain-westend/Cargo.toml
@@ -16,10 +16,10 @@ bp-polkadot-core = { path = "../polkadot-core", default-features = false }
 bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Based Dependencies
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/chain-wococo/Cargo.toml b/bridges/primitives/chain-wococo/Cargo.toml
index ecf783a51eeb..5d2c28f903a1 100644
--- a/bridges/primitives/chain-wococo/Cargo.toml
+++ b/bridges/primitives/chain-wococo/Cargo.toml
@@ -16,10 +16,10 @@ bp-polkadot-core = { path = "../polkadot-core", default-features = false }
 bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Based Dependencies
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/currency-exchange/Cargo.toml b/bridges/primitives/currency-exchange/Cargo.toml
index 43367ba7992b..062f543a0542 100644
--- a/bridges/primitives/currency-exchange/Cargo.toml
+++ b/bridges/primitives/currency-exchange/Cargo.toml
@@ -11,9 +11,9 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 
 # Substrate Dependencies
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/ethereum-poa/Cargo.toml b/bridges/primitives/ethereum-poa/Cargo.toml
index cd2c3a97a0f3..428f5fbcb9b2 100644
--- a/bridges/primitives/ethereum-poa/Cargo.toml
+++ b/bridges/primitives/ethereum-poa/Cargo.toml
@@ -24,10 +24,10 @@ triehash = { version = "0.8.2", default-features = false }
 
 # Substrate Dependencies
 
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [dev-dependencies]
 hex-literal = "0.2"
diff --git a/bridges/primitives/header-chain/Cargo.toml b/bridges/primitives/header-chain/Cargo.toml
index dc58dafb979e..91aeedc9477b 100644
--- a/bridges/primitives/header-chain/Cargo.toml
+++ b/bridges/primitives/header-chain/Cargo.toml
@@ -13,11 +13,11 @@ serde = { version = "1.0", optional = true }
 
 # Substrate Dependencies
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [dev-dependencies]
 bp-test-utils = { path = "../test-utils" }
diff --git a/bridges/primitives/message-dispatch/Cargo.toml b/bridges/primitives/message-dispatch/Cargo.toml
index 84fa48553a21..47a60bd53a8f 100644
--- a/bridges/primitives/message-dispatch/Cargo.toml
+++ b/bridges/primitives/message-dispatch/Cargo.toml
@@ -12,8 +12,8 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
 
 # Substrate Dependencies
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/messages/Cargo.toml b/bridges/primitives/messages/Cargo.toml
index 9cb037a34ce8..bb499a5b481b 100644
--- a/bridges/primitives/messages/Cargo.toml
+++ b/bridges/primitives/messages/Cargo.toml
@@ -15,9 +15,9 @@ bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Dependencies
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/polkadot-core/Cargo.toml b/bridges/primitives/polkadot-core/Cargo.toml
index 995f948e5d47..a63f6a4a0e3f 100644
--- a/bridges/primitives/polkadot-core/Cargo.toml
+++ b/bridges/primitives/polkadot-core/Cargo.toml
@@ -16,13 +16,13 @@ bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Based Dependencies
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [dev-dependencies]
 hex = "0.4"
diff --git a/bridges/primitives/runtime/Cargo.toml b/bridges/primitives/runtime/Cargo.toml
index 17fa96b2c908..4b89dfdbd790 100644
--- a/bridges/primitives/runtime/Cargo.toml
+++ b/bridges/primitives/runtime/Cargo.toml
@@ -13,16 +13,16 @@ num-traits = { version = "0.2", default-features = false }
 
 # Substrate Dependencies
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 
 [features]
diff --git a/bridges/primitives/test-utils/Cargo.toml b/bridges/primitives/test-utils/Cargo.toml
index 5adb2c2b55f5..f5f617f8fa8b 100644
--- a/bridges/primitives/test-utils/Cargo.toml
+++ b/bridges/primitives/test-utils/Cargo.toml
@@ -10,10 +10,10 @@ bp-header-chain = { path = "../header-chain", default-features = false  }
 ed25519-dalek = { version = "1.0", default-features = false, features = ["u64_backend"] }
 finality-grandpa = { version = "0.14.0", default-features = false }
 parity-scale-codec = { version = "2.0.0", default-features = false }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false  }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false  , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [features]
 default = ["std"]
diff --git a/bridges/relays/bin-ethereum/Cargo.toml b/bridges/relays/bin-ethereum/Cargo.toml
index efd9c0194b28..2dfdd37e2a57 100644
--- a/bridges/relays/bin-ethereum/Cargo.toml
+++ b/bridges/relays/bin-ethereum/Cargo.toml
@@ -40,9 +40,9 @@ rialto-runtime = { path = "../../bin/rialto/runtime" }
 
 # Substrate Dependencies
 
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
diff --git a/bridges/relays/bin-substrate/Cargo.toml b/bridges/relays/bin-substrate/Cargo.toml
index fc61d138fde0..1d348decd70e 100644
--- a/bridges/relays/bin-substrate/Cargo.toml
+++ b/bridges/relays/bin-substrate/Cargo.toml
@@ -51,13 +51,13 @@ rialto-runtime = { path = "../../bin/rialto/runtime" }
 
 # Substrate Dependencies
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-version = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 [dev-dependencies]
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 hex-literal = "0.3"
diff --git a/bridges/relays/client-kusama/Cargo.toml b/bridges/relays/client-kusama/Cargo.toml
index b9c397bca6c0..e2e94faf3b34 100644
--- a/bridges/relays/client-kusama/Cargo.toml
+++ b/bridges/relays/client-kusama/Cargo.toml
@@ -17,9 +17,9 @@ bp-kusama = { path = "../../primitives/chain-kusama" }
 
 # Substrate Dependencies
 
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
diff --git a/bridges/relays/client-millau/Cargo.toml b/bridges/relays/client-millau/Cargo.toml
index e16f06f8528b..5ba9dc86cbdd 100644
--- a/bridges/relays/client-millau/Cargo.toml
+++ b/bridges/relays/client-millau/Cargo.toml
@@ -17,9 +17,9 @@ millau-runtime = { path = "../../bin/millau/runtime" }
 
 # Substrate Dependencies
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
diff --git a/bridges/relays/client-polkadot/Cargo.toml b/bridges/relays/client-polkadot/Cargo.toml
index b148745f5a98..3b4420cc274d 100644
--- a/bridges/relays/client-polkadot/Cargo.toml
+++ b/bridges/relays/client-polkadot/Cargo.toml
@@ -17,9 +17,9 @@ bp-polkadot = { path = "../../primitives/chain-polkadot" }
 
 # Substrate Dependencies
 
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
diff --git a/bridges/relays/client-rialto/Cargo.toml b/bridges/relays/client-rialto/Cargo.toml
index 88e8e12add40..27df953955b5 100644
--- a/bridges/relays/client-rialto/Cargo.toml
+++ b/bridges/relays/client-rialto/Cargo.toml
@@ -17,9 +17,9 @@ rialto-runtime = { path = "../../bin/rialto/runtime" }
 
 # Substrate Dependencies
 
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
diff --git a/bridges/relays/client-rococo/Cargo.toml b/bridges/relays/client-rococo/Cargo.toml
index 095f365374a8..1cc5eff0659d 100644
--- a/bridges/relays/client-rococo/Cargo.toml
+++ b/bridges/relays/client-rococo/Cargo.toml
@@ -15,9 +15,9 @@ relay-utils = { path = "../utils" }
 bp-rococo = { path = "../../primitives/chain-rococo" }
 
 # Substrate Dependencies
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
diff --git a/bridges/relays/client-substrate/Cargo.toml b/bridges/relays/client-substrate/Cargo.toml
index 699c3da400ff..681241dd28cf 100644
--- a/bridges/relays/client-substrate/Cargo.toml
+++ b/bridges/relays/client-substrate/Cargo.toml
@@ -26,17 +26,17 @@ relay-utils = { path = "../utils" }
 
 # Substrate Dependencies
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-storage = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-storage = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-version = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 #[dev-dependencies]
 futures = "0.3.7"
diff --git a/bridges/relays/client-westend/Cargo.toml b/bridges/relays/client-westend/Cargo.toml
index a408ae3a46da..8819d8b68f4e 100644
--- a/bridges/relays/client-westend/Cargo.toml
+++ b/bridges/relays/client-westend/Cargo.toml
@@ -17,9 +17,9 @@ bp-westend = { path = "../../primitives/chain-westend" }
 
 # Substrate Dependencies
 
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
diff --git a/bridges/relays/client-wococo/Cargo.toml b/bridges/relays/client-wococo/Cargo.toml
index 22d710ca3d7b..691321f20b8e 100644
--- a/bridges/relays/client-wococo/Cargo.toml
+++ b/bridges/relays/client-wococo/Cargo.toml
@@ -15,9 +15,9 @@ relay-utils = { path = "../utils" }
 bp-wococo = { path = "../../primitives/chain-wococo" }
 
 # Substrate Dependencies
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
diff --git a/bridges/relays/utils/Cargo.toml b/bridges/relays/utils/Cargo.toml
index ff80cab53381..e5923e8bda16 100644
--- a/bridges/relays/utils/Cargo.toml
+++ b/bridges/relays/utils/Cargo.toml
@@ -22,4 +22,4 @@ time = "0.2"
 
 # Substrate dependencies
 
-substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 2b124f2ff215..8f50a8706ef9 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -24,19 +24,19 @@ futures = "0.3.12"
 service = { package = "polkadot-service", path = "../node/service", default-features = false, optional = true }
 polkadot-node-core-pvf = { path = "../node/core/pvf", optional = true }
 
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
-try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
-sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
-sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
-browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", optional = true , branch = "shawntabrizi-v0.8.31" }
+try-runtime-cli = { git = "https://github.com/paritytech/substrate", optional = true , branch = "shawntabrizi-v0.8.31" }
+sc-cli = { git = "https://github.com/paritytech/substrate", optional = true , branch = "shawntabrizi-v0.8.31" }
+sc-service = { git = "https://github.com/paritytech/substrate", optional = true , branch = "shawntabrizi-v0.8.31" }
+browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", optional = true , branch = "shawntabrizi-v0.8.31" }
 
 # this crate is used only to enable `trie-memory-tracker` feature
 # see https://github.com/paritytech/substrate/pull/6745
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [build-dependencies]
-substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
+substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 [features]
 default = [ "wasmtime", "db", "cli", "full-node", "trie-memory-tracker" ]
diff --git a/core-primitives/Cargo.toml b/core-primitives/Cargo.toml
index b5a019de5a63..963a7c1a74b4 100644
--- a/core-primitives/Cargo.toml
+++ b/core-primitives/Cargo.toml
@@ -5,9 +5,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = [ "derive" ] }
 parity-util-mem = { version = "0.9.0", default-features = false, optional = true }
 
diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml
index 7aabbe864249..59ab27034312 100644
--- a/erasure-coding/Cargo.toml
+++ b/erasure-coding/Cargo.toml
@@ -9,6 +9,6 @@ polkadot-primitives = { path = "../primitives" }
 polkadot-node-primitives = { package = "polkadot-node-primitives", path = "../node/primitives" }
 novelpoly = { package = "reed-solomon-novelpoly", version = "1.0.0" }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["std", "derive"] }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 thiserror = "1.0.23"
diff --git a/node/collation-generation/Cargo.toml b/node/collation-generation/Cargo.toml
index fc76ed07ed9a..ccfa9903a48c 100644
--- a/node/collation-generation/Cargo.toml
+++ b/node/collation-generation/Cargo.toml
@@ -12,8 +12,8 @@ polkadot-node-primitives = { path = "../primitives" }
 polkadot-node-subsystem = { path = "../subsystem" }
 polkadot-node-subsystem-util = { path = "../subsystem-util" }
 polkadot-primitives = { path = "../../primitives" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-maybe-compressed-blob  = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-maybe-compressed-blob  = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 thiserror = "1.0.23"
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["bit-vec", "derive"] }
 
diff --git a/node/core/approval-voting/Cargo.toml b/node/core/approval-voting/Cargo.toml
index 3b34ab36207e..f794c75c2b3d 100644
--- a/node/core/approval-voting/Cargo.toml
+++ b/node/core/approval-voting/Cargo.toml
@@ -22,21 +22,21 @@ polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-primitives = { path = "../../primitives" }
 polkadot-node-jaeger = { path = "../../jaeger" }
 
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = ["full_crypto"] }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sc-client-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-consensus-slots = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["full_crypto"] , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [dev-dependencies]
 parking_lot = "0.11.1"
 rand_core = "0.5.1" # should match schnorrkel
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 maplit = "1.0.2"
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
 assert_matches = "1.4.0"
diff --git a/node/core/av-store/Cargo.toml b/node/core/av-store/Cargo.toml
index 87a57e4fb84b..57f44504d943 100644
--- a/node/core/av-store/Cargo.toml
+++ b/node/core/av-store/Cargo.toml
@@ -26,8 +26,8 @@ env_logger = "0.8.2"
 assert_matches = "1.4.0"
 kvdb-memorydb = "0.9.0"
 
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 parking_lot = "0.11.1"
diff --git a/node/core/backing/Cargo.toml b/node/core/backing/Cargo.toml
index d912143b9bcd..23e1dd8f7930 100644
--- a/node/core/backing/Cargo.toml
+++ b/node/core/backing/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 futures = "0.3.12"
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-primitives = { path = "../../primitives" }
 polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
@@ -18,11 +18,11 @@ tracing = "0.1.25"
 thiserror = "1.0.23"
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 futures = { version = "0.3.12", features = ["thread-pool"] }
 assert_matches = "1.4.0"
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
diff --git a/node/core/bitfield-signing/Cargo.toml b/node/core/bitfield-signing/Cargo.toml
index 635aad8f019f..c5950a3807f9 100644
--- a/node/core/bitfield-signing/Cargo.toml
+++ b/node/core/bitfield-signing/Cargo.toml
@@ -10,7 +10,7 @@ tracing = "0.1.25"
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-subsystem = { path = "../../subsystem" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 wasm-timer = "0.2.5"
 thiserror = "1.0.23"
 
diff --git a/node/core/candidate-selection/Cargo.toml b/node/core/candidate-selection/Cargo.toml
index ac7d257e2fd2..1cf041f5aefa 100644
--- a/node/core/candidate-selection/Cargo.toml
+++ b/node/core/candidate-selection/Cargo.toml
@@ -9,7 +9,7 @@ futures = "0.3.12"
 tracing = "0.1.25"
 thiserror = "1.0.23"
 
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-subsystem = { path = "../../subsystem" }
@@ -17,5 +17,5 @@ polkadot-node-primitives = { path = "../../primitives" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
diff --git a/node/core/candidate-validation/Cargo.toml b/node/core/candidate-validation/Cargo.toml
index f48723f1def8..138ee93a15de 100644
--- a/node/core/candidate-validation/Cargo.toml
+++ b/node/core/candidate-validation/Cargo.toml
@@ -9,7 +9,7 @@ async-trait = "0.1.42"
 futures = "0.3.12"
 tracing = "0.1.25"
 
-sp-maybe-compressed-blob = { package = "sp-maybe-compressed-blob", git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-maybe-compressed-blob = { package = "sp-maybe-compressed-blob", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["bit-vec", "derive"] }
 
 polkadot-primitives = { path = "../../../primitives" }
@@ -22,8 +22,8 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 polkadot-node-core-pvf = { path = "../pvf" }
 
 [dev-dependencies]
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 futures = { version = "0.3.12", features = ["thread-pool"] }
 assert_matches = "1.4.0"
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
diff --git a/node/core/chain-api/Cargo.toml b/node/core/chain-api/Cargo.toml
index 707fa812f004..2ae86d186d3e 100644
--- a/node/core/chain-api/Cargo.toml
+++ b/node/core/chain-api/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 futures = "0.3.12"
 tracing = "0.1.25"
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
@@ -16,4 +16,4 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 futures = { version = "0.3.12", features = ["thread-pool"] }
 maplit = "1.0.2"
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
diff --git a/node/core/parachains-inherent/Cargo.toml b/node/core/parachains-inherent/Cargo.toml
index adbf6445489f..42fee4996d11 100644
--- a/node/core/parachains-inherent/Cargo.toml
+++ b/node/core/parachains-inherent/Cargo.toml
@@ -13,6 +13,6 @@ async-trait = "0.1.47"
 polkadot-node-subsystem = { path = "../../subsystem" }
 polkadot-overseer = { path = "../../overseer" }
 polkadot-primitives = { path = "../../../primitives" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
diff --git a/node/core/provisioner/Cargo.toml b/node/core/provisioner/Cargo.toml
index 15f3866fe613..4542ea758d4a 100644
--- a/node/core/provisioner/Cargo.toml
+++ b/node/core/provisioner/Cargo.toml
@@ -15,6 +15,6 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 futures-timer = "3.0.2"
 
 [dev-dependencies]
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
diff --git a/node/core/pvf/Cargo.toml b/node/core/pvf/Cargo.toml
index c0fdbba9c49e..b00117291bad 100644
--- a/node/core/pvf/Cargo.toml
+++ b/node/core/pvf/Cargo.toml
@@ -23,13 +23,13 @@ rand = "0.8.3"
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
 polkadot-parachain = { path = "../../../parachain" }
 polkadot-core-primitives = { path = "../../../core-primitives" }
-sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-executor-wasmtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-executor-wasmtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 [dev-dependencies]
 adder = { package = "test-parachain-adder", path = "../../../parachain/test-parachains/adder" }
diff --git a/node/core/runtime-api/Cargo.toml b/node/core/runtime-api/Cargo.toml
index c552a019ee78..b3009aea52aa 100644
--- a/node/core/runtime-api/Cargo.toml
+++ b/node/core/runtime-api/Cargo.toml
@@ -10,17 +10,17 @@ tracing = "0.1.25"
 memory-lru = "0.1.0"
 parity-util-mem = { version = "0.9.0", default-features = false }
 
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 futures = { version = "0.3.12", features = ["thread-pool"] }
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
 polkadot-node-primitives = { path = "../../primitives" }
diff --git a/node/jaeger/Cargo.toml b/node/jaeger/Cargo.toml
index 4bbcb0541473..cab54a434e13 100644
--- a/node/jaeger/Cargo.toml
+++ b/node/jaeger/Cargo.toml
@@ -12,8 +12,8 @@ lazy_static = "1.4"
 parking_lot = "0.11.1"
 polkadot-primitives = { path = "../../primitives" }
 polkadot-node-primitives = { path = "../primitives" }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 thiserror = "1.0.23"
 log = "0.4.13"
 parity-scale-codec = { version = "2.0.0", default-features = false }
diff --git a/node/network/approval-distribution/Cargo.toml b/node/network/approval-distribution/Cargo.toml
index 900582aa988e..064cb1d4b078 100644
--- a/node/network/approval-distribution/Cargo.toml
+++ b/node/network/approval-distribution/Cargo.toml
@@ -15,7 +15,7 @@ futures = "0.3.8"
 tracing = "0.1.25"
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] }
+sp-core = { git = "https://github.com/paritytech/substrate", features = ["std"] , branch = "shawntabrizi-v0.8.31" }
 
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
diff --git a/node/network/availability-distribution/Cargo.toml b/node/network/availability-distribution/Cargo.toml
index 9242ea10e42e..31885b470de9 100644
--- a/node/network/availability-distribution/Cargo.toml
+++ b/node/network/availability-distribution/Cargo.toml
@@ -15,20 +15,20 @@ polkadot-node-network-protocol = { path = "../../network/protocol" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 polkadot-node-primitives = { path = "../../primitives" }
 polkadot-node-core-runtime-api = { path = "../../core/runtime-api" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"]  }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", features = ["std"]  , branch = "shawntabrizi-v0.8.31" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 thiserror = "1.0.23"
 rand = "0.8.3"
 lru = "0.6.5"
 
 [dev-dependencies]
 polkadot-subsystem-testhelpers = { package = "polkadot-node-subsystem-test-helpers", path = "../../subsystem-test-helpers" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", features = ["std"] , branch = "shawntabrizi-v0.8.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 futures-timer = "3.0.2"
 assert_matches = "1.4.0"
 maplit = "1.0"
diff --git a/node/network/availability-recovery/Cargo.toml b/node/network/availability-recovery/Cargo.toml
index 8587d1b018dc..0bfa6b75ef36 100644
--- a/node/network/availability-recovery/Cargo.toml
+++ b/node/network/availability-recovery/Cargo.toml
@@ -26,9 +26,9 @@ futures-timer = "3.0.2"
 log = "0.4.11"
 smallvec = "1.5.1"
 
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 polkadot-subsystem-testhelpers = { package = "polkadot-node-subsystem-test-helpers", path = "../../subsystem-test-helpers" }
diff --git a/node/network/bitfield-distribution/Cargo.toml b/node/network/bitfield-distribution/Cargo.toml
index 712c95c5dff5..a6cfe79b196e 100644
--- a/node/network/bitfield-distribution/Cargo.toml
+++ b/node/network/bitfield-distribution/Cargo.toml
@@ -15,9 +15,9 @@ polkadot-node-network-protocol = { path = "../../network/protocol" }
 [dev-dependencies]
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
 bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 maplit = "1.0.2"
 log = "0.4.13"
 env_logger = "0.8.2"
diff --git a/node/network/bridge/Cargo.toml b/node/network/bridge/Cargo.toml
index 40ec8982d834..80a57a52e554 100644
--- a/node/network/bridge/Cargo.toml
+++ b/node/network/bridge/Cargo.toml
@@ -10,9 +10,9 @@ futures = "0.3.12"
 tracing = "0.1.25"
 polkadot-primitives = { path = "../../../primitives" }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
-sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
 polkadot-node-network-protocol = { path = "../protocol" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util"}
@@ -22,6 +22,6 @@ parking_lot = "0.11.1"
 [dev-dependencies]
 assert_matches = "1.4.0"
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 futures-timer = "3"
diff --git a/node/network/collator-protocol/Cargo.toml b/node/network/collator-protocol/Cargo.toml
index 817d6511b04c..4542832c9264 100644
--- a/node/network/collator-protocol/Cargo.toml
+++ b/node/network/collator-protocol/Cargo.toml
@@ -11,9 +11,9 @@ futures-timer = "3"
 thiserror = "1.0.23"
 tracing = "0.1.25"
 
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-network-protocol = { path = "../../network/protocol" }
@@ -26,7 +26,7 @@ log = "0.4.13"
 env_logger = "0.8.2"
 assert_matches = "1.4.0"
 
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", features = ["std"] , branch = "shawntabrizi-v0.8.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 polkadot-subsystem-testhelpers = { package = "polkadot-node-subsystem-test-helpers", path = "../../subsystem-test-helpers" }
diff --git a/node/network/gossip-support/Cargo.toml b/node/network/gossip-support/Cargo.toml
index 61bc90e718de..9780253a69a7 100644
--- a/node/network/gossip-support/Cargo.toml
+++ b/node/network/gossip-support/Cargo.toml
@@ -5,8 +5,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 polkadot-node-network-protocol = { path = "../protocol" }
 polkadot-node-subsystem = { path = "../../subsystem" }
@@ -17,9 +17,9 @@ futures = "0.3.8"
 tracing = "0.1.25"
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", features = ["std"] , branch = "shawntabrizi-v0.8.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
 
diff --git a/node/network/protocol/Cargo.toml b/node/network/protocol/Cargo.toml
index 6f32c346e53b..6329f54b36f5 100644
--- a/node/network/protocol/Cargo.toml
+++ b/node/network/protocol/Cargo.toml
@@ -10,7 +10,7 @@ polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-primitives = { path = "../../primitives" }
 polkadot-node-jaeger = { path = "../../jaeger" }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 strum = { version = "0.20", features = ["derive"] }
 futures = "0.3.12"
 thiserror = "1.0.23"
diff --git a/node/network/statement-distribution/Cargo.toml b/node/network/statement-distribution/Cargo.toml
index a958c6df62de..c7a22e7056c2 100644
--- a/node/network/statement-distribution/Cargo.toml
+++ b/node/network/statement-distribution/Cargo.toml
@@ -9,9 +9,9 @@ edition = "2018"
 futures = "0.3.12"
 tracing = "0.1.25"
 polkadot-primitives = { path = "../../../primitives" }
-sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
 polkadot-node-primitives = { path = "../../primitives" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
@@ -24,10 +24,10 @@ thiserror = "1.0.23"
 [dev-dependencies]
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
 assert_matches = "1.4.0"
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 futures-timer = "3.0.2"
diff --git a/node/overseer/Cargo.toml b/node/overseer/Cargo.toml
index 3ecb90f45ffa..d80f7fabc535 100644
--- a/node/overseer/Cargo.toml
+++ b/node/overseer/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2018"
 
 [dependencies]
 async-trait = "0.1.42"
-client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
+client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 futures = "0.3.12"
 futures-timer = "3.0.2"
 polkadot-node-primitives = { package = "polkadot-node-primitives", path = "../primitives" }
@@ -18,7 +18,7 @@ polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../subsystem
 tracing = "0.1.25"
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 polkadot-node-network-protocol = { path = "../network/protocol" }
 futures = { version = "0.3.12", features = ["thread-pool"] }
 femme = "2.1.1"
diff --git a/node/primitives/Cargo.toml b/node/primitives/Cargo.toml
index e8b01dea00f9..e19682620728 100644
--- a/node/primitives/Cargo.toml
+++ b/node/primitives/Cargo.toml
@@ -10,12 +10,12 @@ futures = "0.3.12"
 polkadot-primitives = { path = "../../primitives" }
 polkadot-statement-table = { path = "../../statement-table" }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
-runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-vrf = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-maybe-compressed-blob  = { git = "https://github.com/paritytech/substrate", branch = "master" }
+runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-consensus-vrf = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-maybe-compressed-blob  = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 polkadot-parachain = { path = "../../parachain", default-features = false }
 schnorrkel = "0.9.1"
 thiserror = "1.0.22"
diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml
index bb545daa4de8..580ea084798f 100644
--- a/node/service/Cargo.toml
+++ b/node/service/Cargo.toml
@@ -6,59 +6,59 @@ edition = "2018"
 
 [dependencies]
 # Substrate Client
-sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
-babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 beefy-primitives = { git = "https://github.com/paritytech/grandpa-bridge-gadget", branch = "master" }
 beefy-gadget = { git = "https://github.com/paritytech/grandpa-bridge-gadget", branch = "master" }
-grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus-uncles = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-finality-grandpa-warp-sync = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" }
-service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "master" }
+grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-consensus-uncles = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-finality-grandpa-warp-sync = { git = "https://github.com/paritytech/substrate", optional = true , branch = "shawntabrizi-v0.8.31" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+service = { package = "sc-service", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 # Substrate Primitives
-sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
-consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" }
-grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" }
-inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-storage = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-storage = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 # Substrate Pallets
-pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-mmr-primitives = { git = "https://github.com/paritytech/substrate", branch = "master" }
+pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-mmr-primitives = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 # Substrate Other
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 # External Crates
 futures = "0.3.12"
diff --git a/node/subsystem-test-helpers/Cargo.toml b/node/subsystem-test-helpers/Cargo.toml
index a1751146c9b5..3c08375b3823 100644
--- a/node/subsystem-test-helpers/Cargo.toml
+++ b/node/subsystem-test-helpers/Cargo.toml
@@ -18,9 +18,9 @@ polkadot-node-subsystem = { path = "../subsystem" }
 polkadot-node-subsystem-util = { path = "../subsystem-util" }
 polkadot-primitives = { path = "../../primitives" }
 polkadot-statement-table = { path = "../../statement-table" }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 smallvec = "1.6.1"
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 [dev-dependencies]
 polkadot-overseer = { path = "../overseer" }
diff --git a/node/subsystem-util/Cargo.toml b/node/subsystem-util/Cargo.toml
index cd84dc98b46f..88ba21fbab1a 100644
--- a/node/subsystem-util/Cargo.toml
+++ b/node/subsystem-util/Cargo.toml
@@ -25,11 +25,11 @@ polkadot-node-network-protocol = { path = "../network/protocol" }
 polkadot-primitives = { path = "../../primitives" }
 metered-channel = { path = "../metered-channel"}
 
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 [dev-dependencies]
 assert_matches = "1.4.0"
diff --git a/node/subsystem/Cargo.toml b/node/subsystem/Cargo.toml
index 590af20343e8..9e7119edc6cc 100644
--- a/node/subsystem/Cargo.toml
+++ b/node/subsystem/Cargo.toml
@@ -23,10 +23,10 @@ polkadot-primitives = { path = "../../primitives" }
 polkadot-statement-table = { path = "../../statement-table" }
 polkadot-node-jaeger = { path = "../jaeger" }
 polkadot-procmacro-subsystem-dispatch-gen = { path = "dispatch-gen" }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 smallvec = "1.6.1"
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 thiserror = "1.0.23"
 log = "0.4.13"
 
diff --git a/node/test/client/Cargo.toml b/node/test/client/Cargo.toml
index de1069f67f0f..99c2ec0c9906 100644
--- a/node/test/client/Cargo.toml
+++ b/node/test/client/Cargo.toml
@@ -14,20 +14,20 @@ polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-subsystem = { path = "../../subsystem" }
 
 # Substrate dependencies
-substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }
+substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 [dev-dependencies]
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 futures = "0.3.12"
diff --git a/node/test/service/Cargo.toml b/node/test/service/Cargo.toml
index c4a1a20d6bd7..eb3d193764f1 100644
--- a/node/test/service/Cargo.toml
+++ b/node/test/service/Cargo.toml
@@ -25,38 +25,38 @@ polkadot-test-runtime = { path = "../../../runtime/test-runtime" }
 polkadot-runtime-parachains = { path = "../../../runtime/parachains" }
 
 # Substrate dependencies
-sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
-babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" }
-babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" }
-consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
-grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" }
-grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" }
-inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
-service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }
-substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+service = { package = "sc-service", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 [dev-dependencies]
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 serde_json = "1.0.61"
-substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
+substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 tokio = { version = "0.2", features = ["macros"] }
diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml
index 73ec9ca13a01..5606c7250d57 100644
--- a/parachain/Cargo.toml
+++ b/parachain/Cargo.toml
@@ -11,9 +11,9 @@ edition = "2018"
 # various unnecessary Substrate-specific endpoints.
 parity-scale-codec = { version = "2.0.0", default-features = false, features = [ "derive" ] }
 parity-util-mem = { version = "0.9.0", optional = true }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 polkadot-core-primitives = { path = "../core-primitives", default-features = false }
 derive_more = "0.99.11"
 
diff --git a/parachain/test-parachains/Cargo.toml b/parachain/test-parachains/Cargo.toml
index d1659aa6d715..b70cea4eccd2 100644
--- a/parachain/test-parachains/Cargo.toml
+++ b/parachain/test-parachains/Cargo.toml
@@ -14,7 +14,7 @@ adder = { package = "test-parachain-adder", path = "adder" }
 halt = { package = "test-parachain-halt", path = "halt" }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 [features]
 default = [ "std" ]
diff --git a/parachain/test-parachains/adder/Cargo.toml b/parachain/test-parachains/adder/Cargo.toml
index 89745ec1172a..569c871f32f5 100644
--- a/parachain/test-parachains/adder/Cargo.toml
+++ b/parachain/test-parachains/adder/Cargo.toml
@@ -9,12 +9,12 @@ build = "build.rs"
 [dependencies]
 parachain = { package = "polkadot-parachain", path = "../../", default-features = false, features = [ "wasm-api" ] }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 tiny-keccak = { version = "2.0.2", features = ["keccak"] }
 dlmalloc = { version = "0.2.1", features = [ "global" ] }
 
 # We need to make sure the global allocator is disabled until we have support of full substrate externalities
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = [ "disable_allocator" ] }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, features = [ "disable_allocator" ] , branch = "shawntabrizi-v0.8.31" }
 
 [build-dependencies]
 substrate-wasm-builder = "3.0.0"
diff --git a/parachain/test-parachains/adder/collator/Cargo.toml b/parachain/test-parachains/adder/collator/Cargo.toml
index dad80eeb3688..dc5a5168bf39 100644
--- a/parachain/test-parachains/adder/collator/Cargo.toml
+++ b/parachain/test-parachains/adder/collator/Cargo.toml
@@ -27,10 +27,10 @@ polkadot-service = { path = "../../../../node/service" }
 polkadot-node-primitives = { path = "../../../../node/primitives" }
 polkadot-node-subsystem = { path = "../../../../node/subsystem" }
 
-sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 # This one is tricky. Even though it is not used directly by the collator, we still need it for the
 # `puppet_worker` binary, which is required for the integration test. However, this shouldn't be
@@ -41,8 +41,8 @@ polkadot-node-core-pvf = { path = "../../../../node/core/pvf" }
 polkadot-parachain = { path = "../../.." }
 polkadot-test-service = { path = "../../../../node/test/service" }
 
-substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
+substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 tokio = { version = "0.2", features = ["macros"] }
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index 3ba22c2cd657..5215a7e16c4a 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -7,29 +7,29 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.123", optional = true, features = ["derive"] }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["bit-vec", "derive"] }
-primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", optional = true , branch = "shawntabrizi-v0.8.31" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 polkadot-parachain = { path = "../parachain", default-features = false }
 polkadot-core-primitives = { path = "../core-primitives", default-features = false }
-trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 hex-literal = "0.3.1"
 parity-util-mem = { version = "0.9.0", default-features = false, optional = true }
 thiserror = "1.0.23"
 
 [dev-dependencies]
-sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 pretty_assertions = "0.6.1"
 
 [features]
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 1d64cca51fa3..aa68def796f6 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -7,27 +7,27 @@ edition = "2018"
 [dependencies]
 jsonrpc-core = "15.1.0"
 polkadot-primitives = { path = "../primitives" }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
-txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-mmr-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-mmr-rpc = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 parity-scale-codec = { version = "2.0.0", default-features = false }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 beefy-gadget = { git = "https://github.com/paritytech/grandpa-bridge-gadget", branch = "master" }
 beefy-gadget-rpc = { git = "https://github.com/paritytech/grandpa-bridge-gadget", branch = "master" }
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
index 2cf297af5bba..6d5c20c86d82 100644
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -15,32 +15,32 @@ serde_derive = { version = "1.0.117", optional = true }
 static_assertions = "1.1.0"
 
 beefy-primitives = { git = "https://github.com/paritytech/grandpa-bridge-gadget", branch = "master", default-features = false }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
-pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system = {git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 pallet-beefy = { git = "https://github.com/paritytech/grandpa-bridge-gadget", branch = "master", default-features = false }
-pallet-mmr = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+pallet-mmr = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features=false, optional = true }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
+pallet-babe = { git = "https://github.com/paritytech/substrate", default-features=false, optional = true , branch = "shawntabrizi-v0.8.31" }
 
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
 libsecp256k1 = { version = "0.3.5", default-features = false }
@@ -51,15 +51,15 @@ xcm = { path = "../../xcm", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.3.1"
-keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-support-test = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
+keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+frame-support-test = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 trie-db = "0.22.3"
 serde_json = "1.0.61"
 libsecp256k1 = "0.3.5"
diff --git a/runtime/common/slot_range_helper/Cargo.toml b/runtime/common/slot_range_helper/Cargo.toml
index 12f96b082ba9..f069857d1a64 100644
--- a/runtime/common/slot_range_helper/Cargo.toml
+++ b/runtime/common/slot_range_helper/Cargo.toml
@@ -8,8 +8,8 @@ edition = "2018"
 paste = "1.0"
 enumn = "0.1.3"
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
-sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 [features]
 default = ["std"]
diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml
index 22305f8ca56c..c49dc0622912 100644
--- a/runtime/kusama/Cargo.toml
+++ b/runtime/kusama/Cargo.toml
@@ -15,69 +15,70 @@ serde_derive = { version = "1.0.117", optional = true }
 static_assertions = "1.1.0"
 smallvec = "1.6.1"
 
-authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 beefy-primitives = { git = "https://github.com/paritytech/grandpa-bridge-gadget", branch = "master", default-features = false }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-arithmetic = { package = "sp-arithmetic", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-arithmetic = { package = "sp-arithmetic", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-npos-elections = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
-pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-gilt = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-mmr-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-nicks = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-society = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking-reward-fn = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-bounties = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-gilt = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-identity = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-im-online = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-indices = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-mmr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-nicks = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-recovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-society = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-staking-reward-fn = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system = {git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-tips = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 pallet-xcm = { path = "../../xcm/pallet-xcm", default-features = false }
+frame-election-provider-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
+frame-try-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
+pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
+pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
+frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
 hex-literal = { version = "0.3.1", optional = true }
 
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
@@ -92,8 +93,8 @@ xcm-builder = { package = "xcm-builder", path = "../../xcm/xcm-builder", default
 hex-literal = "0.3.1"
 libsecp256k1 = "0.3.5"
 tiny-keccak = "2.0.2"
-keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
+keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 separator = "0.4.1"
 serde_json = "1.0.61"
 
@@ -173,6 +174,7 @@ std = [
 	"xcm/std",
 	"xcm-executor/std",
 	"xcm-builder/std",
+	"frame-election-provider-support/std",
 ]
 runtime-benchmarks = [
 	"runtime-common/runtime-benchmarks",
@@ -209,6 +211,7 @@ runtime-benchmarks = [
 	"frame-system-benchmarking",
 	"hex-literal",
 	"xcm-builder/runtime-benchmarks",
+	"frame-election-provider-support/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-executive/try-runtime",
diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
index 28449d52ae1a..1b3d0da81243 100644
--- a/runtime/kusama/src/lib.rs
+++ b/runtime/kusama/src/lib.rs
@@ -465,6 +465,10 @@ impl pallet_staking::Config for Runtime {
 	type UnixTime = Timestamp;
 	type CurrencyToVote = CurrencyToVote;
 	type ElectionProvider = ElectionProviderMultiPhase;
+	type GenesisElectionProvider =
+		frame_election_provider_support::onchain::OnChainSequentialPhragmen<
+			pallet_election_provider_multi_phase::OnChainConfig<Self>
+		>;
 	type RewardRemainder = Treasury;
 	type Event = Event;
 	type Slash = Treasury;
diff --git a/runtime/kusama/src/weights/pallet_staking.rs b/runtime/kusama/src/weights/pallet_staking.rs
index 753f13892186..ae7720016488 100644
--- a/runtime/kusama/src/weights/pallet_staking.rs
+++ b/runtime/kusama/src/weights/pallet_staking.rs
@@ -219,4 +219,13 @@ impl<T: frame_system::Config> pallet_staking::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}
+	fn update_staking_limits() -> Weight {
+		(6_398_000 as Weight)
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+	}
+	fn chill_other() -> Weight {
+		(44_694_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
 }
diff --git a/runtime/parachains/Cargo.toml b/runtime/parachains/Cargo.toml
index 38bda09be9df..9b416703e6fa 100644
--- a/runtime/parachains/Cargo.toml
+++ b/runtime/parachains/Cargo.toml
@@ -12,27 +12,27 @@ rustc-hex = { version = "2.1.0", default-features = false }
 serde = { version = "1.0.123", features = [ "derive" ], optional = true }
 derive_more = "0.99.11"
 
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", optional = true , branch = "shawntabrizi-v0.8.31" }
 
-pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
+pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system = {git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
 
 xcm = { package = "xcm", path = "../../xcm", default-features = false }
 xcm-executor = { package = "xcm-executor", path = "../../xcm/xcm-executor", default-features = false }
@@ -45,18 +45,18 @@ rand_chacha = { version = "0.3.0", default-features = false }
 [dev-dependencies]
 futures = "0.3.12"
 hex-literal = "0.3.1"
-keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-support-test = { git = "https://github.com/paritytech/substrate", branch = "master" }
+keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+frame-support-test = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 serde_json = "1.0.61"
 libsecp256k1 = "0.3.5"
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 
 
 [features]
diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml
index 709d704a16e4..8657e251d17c 100644
--- a/runtime/polkadot/Cargo.toml
+++ b/runtime/polkadot/Cargo.toml
@@ -15,64 +15,65 @@ serde_derive = { version = "1.0.117", optional = true }
 static_assertions = "1.1.0"
 smallvec = "1.6.1"
 
-authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 beefy-primitives = { git = "https://github.com/paritytech/grandpa-bridge-gadget", branch = "master", default-features = false }
-block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-npos-elections = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
-pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-mmr-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-nicks = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-bounties = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-identity = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-im-online = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-indices = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-mmr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-nicks = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+frame-system = {git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-tips = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-election-provider-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
+frame-try-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
+frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
+pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
+pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
 hex-literal = { version = "0.3.1", optional = true }
 
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
@@ -82,8 +83,8 @@ primitives = { package = "polkadot-primitives", path = "../../primitives", defau
 hex-literal = "0.3.1"
 libsecp256k1 = "0.3.5"
 tiny-keccak = "2.0.2"
-keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
+keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 trie-db = "0.22.3"
 serde_json = "1.0.61"
 separator = "0.4.1"
@@ -154,6 +155,7 @@ std = [
 	"sp-npos-elections/std",
 	"beefy-primitives/std",
 	"pallet-mmr-primitives/std",
+	"frame-election-provider-support/std",
 ]
 runtime-benchmarks = [
 	"runtime-common/runtime-benchmarks",
@@ -186,6 +188,7 @@ runtime-benchmarks = [
 	"pallet-session-benchmarking",
 	"frame-system-benchmarking",
 	"hex-literal",
+	"frame-election-provider-support/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-executive/try-runtime",
diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs
index 9aaea721c41d..97e4cda0fde6 100644
--- a/runtime/polkadot/src/lib.rs
+++ b/runtime/polkadot/src/lib.rs
@@ -413,6 +413,10 @@ impl pallet_staking::Config for Runtime {
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type NextNewSession = Session;
 	type ElectionProvider = ElectionProviderMultiPhase;
+	type GenesisElectionProvider =
+		frame_election_provider_support::onchain::OnChainSequentialPhragmen<
+			pallet_election_provider_multi_phase::OnChainConfig<Self>
+		>;
 	type WeightInfo = weights::pallet_staking::WeightInfo<Runtime>;
 }
 
diff --git a/runtime/polkadot/src/weights/pallet_staking.rs b/runtime/polkadot/src/weights/pallet_staking.rs
index 3f59cd10ced5..438777649766 100644
--- a/runtime/polkadot/src/weights/pallet_staking.rs
+++ b/runtime/polkadot/src/weights/pallet_staking.rs
@@ -219,4 +219,13 @@ impl<T: frame_system::Config> pallet_staking::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}
+	fn update_staking_limits() -> Weight {
+		(6_398_000 as Weight)
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+	}
+	fn chill_other() -> Weight {
+		(44_694_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
 }
diff --git a/runtime/rococo/Cargo.toml b/runtime/rococo/Cargo.toml
index 008b01965c3b..f81119b8a3be 100644
--- a/runtime/rococo/Cargo.toml
+++ b/runtime/rococo/Cargo.toml
@@ -13,50 +13,50 @@ smallvec = "1.6.1"
 hex-literal = "0.3.1"
 log = { version = "0.4.14", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
-tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
-babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 beefy-primitives = { git = "https://github.com/paritytech/grandpa-bridge-gadget", branch = "master", default-features = false }
-frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 pallet-beefy = { git = "https://github.com/paritytech/grandpa-bridge-gadget", branch = "master", default-features = false }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-mmr = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-mmr-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-im-online = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-indices = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-mmr = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-mmr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
-frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+frame-system = {git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
diff --git a/runtime/test-runtime/Cargo.toml b/runtime/test-runtime/Cargo.toml
index 5fad5cc2a815..55c5bcae5908 100644
--- a/runtime/test-runtime/Cargo.toml
+++ b/runtime/test-runtime/Cargo.toml
@@ -14,45 +14,45 @@ serde = { version = "1.0.123", default-features = false }
 serde_derive = { version = "1.0.117", optional = true }
 smallvec = "1.6.1"
 
-authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 beefy-primitives = { git = "https://github.com/paritytech/grandpa-bridge-gadget", branch = "master", default-features = false }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-election-provider-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-election-provider-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
-pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-mmr-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-nicks = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" }
-frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-indices = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-mmr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-nicks = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+frame-system = {git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
@@ -63,8 +63,8 @@ polkadot-runtime-parachains = { path = "../parachains", default-features = false
 hex-literal = "0.3.1"
 libsecp256k1 = "0.3.5"
 tiny-keccak = "2.0.2"
-keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
+keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 serde_json = "1.0.61"
 
 [build-dependencies]
diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs
index 230c2f2e5f88..615e3d7d2122 100644
--- a/runtime/test-runtime/src/lib.rs
+++ b/runtime/test-runtime/src/lib.rs
@@ -64,7 +64,7 @@ use pallet_grandpa::{AuthorityId as GrandpaId, fg_primitives};
 use sp_version::NativeVersion;
 use sp_core::OpaqueMetadata;
 use sp_staking::SessionIndex;
-use frame_support::{parameter_types, construct_runtime, traits::KeyOwnerProofSystem};
+use frame_support::{parameter_types, construct_runtime, traits::{KeyOwnerProofSystem, Randomness}};
 use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
 use pallet_transaction_payment::{FeeDetails, RuntimeDispatchInfo};
 use pallet_session::historical as session_historical;
@@ -336,6 +336,8 @@ impl pallet_staking::Config for Runtime {
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type NextNewSession = Session;
 	type ElectionProvider = frame_election_provider_support::onchain::OnChainSequentialPhragmen<Self>;
+	type GenesisElectionProvider =
+		frame_election_provider_support::onchain::OnChainSequentialPhragmen<Self>;
 	type WeightInfo = ();
 }
 
diff --git a/runtime/westend/Cargo.toml b/runtime/westend/Cargo.toml
index fbd9de2d2a3f..803df7017ad9 100644
--- a/runtime/westend/Cargo.toml
+++ b/runtime/westend/Cargo.toml
@@ -15,66 +15,67 @@ serde_derive = { version = "1.0.117", optional = true }
 smallvec = "1.6.1"
 static_assertions = "1.1.0"
 
-authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 beefy-primitives = { git = "https://github.com/paritytech/grandpa-bridge-gadget", branch = "master", default-features = false }
-inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-npos-elections = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
-frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-mmr-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-nicks = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-society = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+frame-election-provider-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system = {git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-identity = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-im-online = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-indices = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-mmr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-nicks = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-recovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-society = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 pallet-xcm = { path = "../../xcm/pallet-xcm", default-features = false }
 
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
+frame-try-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
+frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
+pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
+pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "shawntabrizi-v0.8.31" }
 hex-literal = { version = "0.3.1", optional = true }
 
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
@@ -90,8 +91,8 @@ xcm-builder = { package = "xcm-builder", path = "../../xcm/xcm-builder", default
 hex-literal = "0.3.1"
 libsecp256k1 = "0.3.5"
 tiny-keccak = "2.0.2"
-keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
+keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 serde_json = "1.0.61"
 
 [build-dependencies]
@@ -168,6 +169,7 @@ std = [
 	"xcm/std",
 	"xcm-executor/std",
 	"xcm-builder/std",
+	"frame-election-provider-support/std",
 ]
 runtime-benchmarks = [
 	"runtime-common/runtime-benchmarks",
@@ -200,6 +202,7 @@ runtime-benchmarks = [
 	"frame-system-benchmarking",
 	"hex-literal",
 	"xcm-builder/runtime-benchmarks",
+	"frame-election-provider-support/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-executive/try-runtime",
diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs
index 61e795b27c62..85713d4e3ea8 100644
--- a/runtime/westend/src/lib.rs
+++ b/runtime/westend/src/lib.rs
@@ -413,6 +413,10 @@ impl pallet_staking::Config for Runtime {
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type NextNewSession = Session;
 	type ElectionProvider = ElectionProviderMultiPhase;
+	type GenesisElectionProvider =
+		frame_election_provider_support::onchain::OnChainSequentialPhragmen<
+			pallet_election_provider_multi_phase::OnChainConfig<Self>
+		>;
 	type WeightInfo = weights::pallet_staking::WeightInfo<Runtime>;
 }
 
diff --git a/runtime/westend/src/weights/pallet_staking.rs b/runtime/westend/src/weights/pallet_staking.rs
index 897541f97995..8324f72b2a42 100644
--- a/runtime/westend/src/weights/pallet_staking.rs
+++ b/runtime/westend/src/weights/pallet_staking.rs
@@ -219,4 +219,13 @@ impl<T: frame_system::Config> pallet_staking::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}
+	fn update_staking_limits() -> Weight {
+		(6_398_000 as Weight)
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+	}
+	fn chill_other() -> Weight {
+		(44_694_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+	}
 }
diff --git a/statement-table/Cargo.toml b/statement-table/Cargo.toml
index 5102fc29191d..25f376aca604 100644
--- a/statement-table/Cargo.toml
+++ b/statement-table/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2018"
 
 [dependencies]
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "shawntabrizi-v0.8.31" }
 primitives = { package = "polkadot-primitives", path = "../primitives" }
diff --git a/xcm/pallet-xcm/Cargo.toml b/xcm/pallet-xcm/Cargo.toml
index 75d737ed69cd..17fff4d97a61 100644
--- a/xcm/pallet-xcm/Cargo.toml
+++ b/xcm/pallet-xcm/Cargo.toml
@@ -8,10 +8,10 @@ version = "0.1.0"
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "shawntabrizi-v0.8.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "shawntabrizi-v0.8.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "shawntabrizi-v0.8.31" }
 
 xcm = { path = "..", default-features = false }
 xcm-executor = { path = "../xcm-executor", default-features = false }
@@ -27,4 +27,4 @@ std = [
 	"frame-system/std",
 	"xcm/std",
 ]
-runtime-benchmarks = []
\ No newline at end of file
+runtime-benchmarks = []
diff --git a/xcm/xcm-builder/Cargo.toml b/xcm/xcm-builder/Cargo.toml
index b9eae148b1c7..2de149ce1d4d 100644
--- a/xcm/xcm-builder/Cargo.toml
+++ b/xcm/xcm-builder/Cargo.toml
@@ -10,13 +10,13 @@ impl-trait-for-tuples = "0.2.0"
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
 xcm = { path = "..", default-features = false }
 xcm-executor = { path = "../xcm-executor", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 
 # Polkadot dependencies
 polkadot-parachain = { path = "../../parachain", default-features = false }
diff --git a/xcm/xcm-executor/Cargo.toml b/xcm/xcm-executor/Cargo.toml
index 13ed03f271b4..cc9c1fbd714c 100644
--- a/xcm/xcm-executor/Cargo.toml
+++ b/xcm/xcm-executor/Cargo.toml
@@ -9,12 +9,12 @@ version = "0.9.3"
 impl-trait-for-tuples = "0.2.0"
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
 xcm = { path = "..", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "shawntabrizi-v0.8.31" }
 log = { version = "0.4.14", default-features = false }
 
 [features]