diff --git a/Cargo.lock b/Cargo.lock
index 562b5fdc3..dfd95203a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -18,7 +18,16 @@ version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
 dependencies = [
- "gimli",
+ "gimli 0.26.2",
+]
+
+[[package]]
+name = "addr2line"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+dependencies = [
+ "gimli 0.27.0",
 ]
 
 [[package]]
@@ -108,9 +117,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.66"
+version = "1.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
+checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
 
 [[package]]
 name = "approx"
@@ -123,9 +132,9 @@ dependencies = [
 
 [[package]]
 name = "arbitrary"
-version = "1.2.0"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29d47fbf90d5149a107494b15a7dc8d69b351be2db3bb9691740e88ec17fd880"
+checksum = "b0224938f92e7aef515fac2ff2d18bd1115c1394ddf4a092e0c87e8be9499ee5"
 dependencies = [
  "derive_arbitrary",
 ]
@@ -236,7 +245,7 @@ dependencies = [
  "slab",
  "socket2",
  "waker-fn",
- "windows-sys 0.42.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -264,7 +273,7 @@ dependencies = [
  "futures-lite",
  "libc",
  "signal-hook",
- "windows-sys 0.42.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -318,9 +327,9 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
 
 [[package]]
 name = "async-trait"
-version = "0.1.59"
+version = "0.1.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364"
+checksum = "689894c2db1ea643a50834b999abf1c110887402542955ff5451dab8f861f9ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -342,9 +351,9 @@ dependencies = [
 
 [[package]]
 name = "atomic-waker"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a"
+checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599"
 
 [[package]]
 name = "atty"
@@ -352,7 +361,7 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.1.19",
  "libc",
  "winapi",
 ]
@@ -379,16 +388,16 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.66"
+version = "0.3.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7"
+checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
 dependencies = [
- "addr2line",
+ "addr2line 0.19.0",
  "cc",
  "cfg-if 1.0.0",
  "libc",
- "miniz_oxide 0.5.4",
- "object 0.29.0",
+ "miniz_oxide",
+ "object 0.30.2",
  "rustc-demangle",
 ]
 
@@ -416,6 +425,12 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
+[[package]]
+name = "base64"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
+
 [[package]]
 name = "battery-station-runtime"
 version = "0.3.8"
@@ -525,8 +540,9 @@ dependencies = [
 [[package]]
 name = "beefy-gadget"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
+ "async-trait",
  "beefy-primitives",
  "fnv",
  "futures 0.3.25",
@@ -537,6 +553,7 @@ dependencies = [
  "parking_lot 0.12.1",
  "sc-chain-spec",
  "sc-client-api",
+ "sc-consensus",
  "sc-finality-grandpa",
  "sc-keystore",
  "sc-network",
@@ -559,7 +576,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "beefy-gadget",
  "beefy-primitives",
@@ -579,7 +596,7 @@ dependencies = [
 [[package]]
 name = "beefy-merkle-tree"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "beefy-primitives",
  "sp-api",
@@ -588,7 +605,7 @@ dependencies = [
 [[package]]
 name = "beefy-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -653,9 +670,9 @@ dependencies = [
 
 [[package]]
 name = "blake2"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b12e5fd123190ce1c2e559308a94c9bacad77907d4c6005d9e58fe1a0689e55e"
+checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
 dependencies = [
  "digest 0.10.6",
 ]
@@ -776,11 +793,12 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
 
 [[package]]
 name = "bstr"
-version = "0.2.17"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
+checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b"
 dependencies = [
  "memchr",
+ "serde",
 ]
 
 [[package]]
@@ -794,9 +812,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.11.1"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
+checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
 
 [[package]]
 name = "byte-slice-cast"
@@ -835,9 +853,9 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e"
+checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055"
 dependencies = [
  "serde",
 ]
@@ -859,16 +877,16 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.14",
+ "semver 1.0.16",
  "serde",
  "serde_json",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.77"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
+checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
 dependencies = [
  "jobserver",
 ]
@@ -882,6 +900,15 @@ dependencies = [
  "nom",
 ]
 
+[[package]]
+name = "cfg-expr"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db"
+dependencies = [
+ "smallvec",
+]
+
 [[package]]
 name = "cfg-if"
 version = "0.1.10"
@@ -1015,7 +1042,7 @@ version = "3.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
 dependencies = [
- "heck 0.4.0",
+ "heck",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -1064,12 +1091,12 @@ dependencies = [
 
 [[package]]
 name = "comfy-table"
-version = "5.0.1"
+version = "6.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b103d85ca6e209388771bfb7aa6b68a7aeec4afbf6f0a0264bfbf50360e5212e"
+checksum = "6e7b787b0dc42e8111badfdbe4c3059158ccb2db8780352fa1b01e8ccf45cc4d"
 dependencies = [
- "strum 0.23.0",
- "strum_macros 0.23.1",
+ "strum",
+ "strum_macros",
  "unicode-width",
 ]
 
@@ -1108,9 +1135,9 @@ dependencies = [
 
 [[package]]
 name = "concurrent-queue"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b"
+checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1202,7 +1229,7 @@ dependencies = [
  "cranelift-codegen-shared",
  "cranelift-entity",
  "cranelift-isle",
- "gimli",
+ "gimli 0.26.2",
  "log",
  "regalloc2",
  "smallvec",
@@ -1365,7 +1392,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
  "generic-array 0.14.6",
- "typenum 1.15.0",
+ "typenum 1.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1421,7 +1448,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-cli"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f"
 dependencies = [
  "clap",
  "parity-scale-codec",
@@ -1436,7 +1463,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-collator"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f"
 dependencies = [
  "cumulus-client-consensus-common",
  "cumulus-client-network",
@@ -1460,7 +1487,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-consensus-common"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f"
 dependencies = [
  "async-trait",
  "cumulus-relay-chain-interface",
@@ -1481,7 +1508,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-consensus-relay-chain"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f"
 dependencies = [
  "async-trait",
  "cumulus-client-consensus-common",
@@ -1505,7 +1532,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-network"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f"
 dependencies = [
  "async-trait",
  "cumulus-relay-chain-interface",
@@ -1530,7 +1557,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-pov-recovery"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f"
 dependencies = [
  "cumulus-primitives-core",
  "cumulus-relay-chain-interface",
@@ -1554,7 +1581,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-service"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f"
 dependencies = [
  "cumulus-client-cli",
  "cumulus-client-collator",
@@ -1582,7 +1609,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-dmp-queue"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -1600,8 +1627,9 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-parachain-system"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f"
 dependencies = [
+ "bytes",
  "cumulus-pallet-parachain-system-proc-macro",
  "cumulus-primitives-core",
  "cumulus-primitives-parachain-inherent",
@@ -1630,7 +1658,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-parachain-system-proc-macro"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -1641,7 +1669,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-xcm"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -1658,7 +1686,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-xcmp-queue"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f"
 dependencies = [
  "cumulus-primitives-core",
  "frame-benchmarking",
@@ -1677,7 +1705,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-core"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -1693,7 +1721,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-parachain-inherent"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -1716,7 +1744,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-timestamp"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f"
 dependencies = [
  "cumulus-primitives-core",
  "futures 0.3.25",
@@ -1729,10 +1757,11 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-utility"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
+ "log",
  "parity-scale-codec",
  "polkadot-core-primitives",
  "polkadot-parachain",
@@ -1741,19 +1770,20 @@ dependencies = [
  "sp-std",
  "sp-trie",
  "xcm",
+ "xcm-builder",
+ "xcm-executor",
 ]
 
 [[package]]
 name = "cumulus-relay-chain-inprocess-interface"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
  "cumulus-relay-chain-interface",
  "futures 0.3.25",
  "futures-timer",
- "parking_lot 0.12.1",
  "polkadot-cli",
  "polkadot-client",
  "polkadot-service",
@@ -1776,7 +1806,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-interface"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -1799,7 +1829,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-rpc-interface"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f"
 dependencies = [
  "async-trait",
  "backoff",
@@ -1818,6 +1848,7 @@ dependencies = [
  "sp-runtime",
  "sp-state-machine",
  "sp-storage",
+ "tokio",
  "tracing",
  "url",
 ]
@@ -1825,7 +1856,7 @@ dependencies = [
 [[package]]
 name = "cumulus-test-relay-sproof-builder"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f"
 dependencies = [
  "cumulus-primitives-core",
  "parity-scale-codec",
@@ -1863,22 +1894,23 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.0.0-pre.1"
+version = "4.0.0-pre.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf"
+checksum = "67bc65846be335cb20f4e52d49a437b773a2c1fdb42b19fc84e79e6f6771536f"
 dependencies = [
- "byteorder",
- "digest 0.9.0",
- "rand_core 0.6.4",
+ "cfg-if 1.0.0",
+ "fiat-crypto",
+ "packed_simd_2",
+ "platforms 3.0.2",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "cxx"
-version = "1.0.83"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf"
+checksum = "b61a7545f753a88bcbe0a70de1fcc0221e10bfc752f576754fa91e663db1622e"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -1888,9 +1920,9 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.83"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39"
+checksum = "f464457d494b5ed6905c63b0c4704842aba319084a0a3561cdc1359536b53200"
 dependencies = [
  "cc",
  "codespan-reporting",
@@ -1903,15 +1935,15 @@ dependencies = [
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.83"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12"
+checksum = "43c7119ce3a3701ed81aca8410b9acf6fc399d2629d057b87e2efa4e63a3aaea"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.83"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6"
+checksum = "65e07508b90551e610910fa648a1878991d367064997a596135b86df30daf07e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1920,9 +1952,9 @@ dependencies = [
 
 [[package]]
 name = "data-encoding"
-version = "2.3.2"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
+checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"
 
 [[package]]
 name = "data-encoding-macro"
@@ -1966,9 +1998,9 @@ dependencies = [
 
 [[package]]
 name = "derive_arbitrary"
-version = "1.2.0"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4903dff04948f22033ca30232ab8eca2c3fc4c913a8b6a34ee5199699814817f"
+checksum = "cf460bbff5f571bfc762da5102729f59f338be7db17a21fade44c5c4f5005350"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2076,9 +2108,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 
 [[package]]
 name = "dtoa"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8a6eee2d5d0d113f015688310da018bd1d864d86bd567c8fca9c266889e1bfa"
+checksum = "c00704156a7de8df8da0911424e30c2049957b0a714542a44e05fe693dd85313"
 
 [[package]]
 name = "dyn-clonable"
@@ -2103,9 +2135,9 @@ dependencies = [
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2"
+checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60"
 
 [[package]]
 name = "ecdsa"
@@ -2121,9 +2153,9 @@ dependencies = [
 
 [[package]]
 name = "ed25519"
-version = "1.5.2"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369"
+checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
 dependencies = [
  "signature",
 ]
@@ -2142,6 +2174,20 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "ed25519-zebra"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6"
+dependencies = [
+ "curve25519-dalek 3.2.0",
+ "hashbrown 0.12.3",
+ "hex",
+ "rand_core 0.6.4",
+ "sha2 0.9.9",
+ "zeroize",
+]
+
 [[package]]
 name = "either"
 version = "1.8.0"
@@ -2172,7 +2218,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73"
 dependencies = [
- "heck 0.4.0",
+ "heck",
  "proc-macro2",
  "quote",
  "syn",
@@ -2200,9 +2246,9 @@ dependencies = [
 
 [[package]]
 name = "enumn"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038b1afa59052df211f9efd58f8b1d84c242935ede1c3dbaed26b018a9e06ae2"
+checksum = "e88bcb3a067a6555d577aba299e75eff9942da276e6506fc6274327daa026132"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2222,6 +2268,19 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "env_logger"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
+dependencies = [
+ "humantime",
+ "is-terminal",
+ "log",
+ "regex",
+ "termcolor",
+]
+
 [[package]]
 name = "environmental"
 version = "1.1.4"
@@ -2354,33 +2413,39 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "fiat-crypto"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90"
+
 [[package]]
 name = "file-per-thread-logger"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21e16290574b39ee41c71aeb90ae960c504ebaf1e2a1c87bd52aa56ed6e1a02f"
+checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866"
 dependencies = [
- "env_logger",
+ "env_logger 0.10.0",
  "log",
 ]
 
 [[package]]
 name = "filetime"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3"
+checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
  "redox_syscall",
- "windows-sys 0.42.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "finality-grandpa"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22349c6a11563a202d95772a68e0fcf56119e74ea8a2a19cf2301460fcd0df5"
+checksum = "e24e6c429951433ccb7c87fd528c60084834dcd14763182c1f83291bcde24c34"
 dependencies = [
  "either",
  "futures 0.3.25",
@@ -2418,7 +2483,7 @@ checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
 dependencies = [
  "crc32fast",
  "libz-sys",
- "miniz_oxide 0.6.2",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -2430,7 +2495,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2447,7 +2512,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2459,6 +2524,7 @@ dependencies = [
  "serde",
  "sp-api",
  "sp-application-crypto",
+ "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-runtime-interface",
@@ -2469,7 +2535,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "Inflector",
  "chrono",
@@ -2520,7 +2586,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-solution-type"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -2531,7 +2597,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-election-provider-solution-type",
  "frame-support",
@@ -2547,10 +2613,11 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-support",
  "frame-system",
+ "frame-try-runtime",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
@@ -2575,7 +2642,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -2589,6 +2656,7 @@ dependencies = [
  "scale-info",
  "serde",
  "smallvec",
+ "sp-api",
  "sp-arithmetic",
  "sp-core",
  "sp-core-hashing-proc-macro",
@@ -2605,10 +2673,12 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "Inflector",
+ "cfg-expr",
  "frame-support-procedural-tools",
+ "itertools",
  "proc-macro2",
  "quote",
  "syn",
@@ -2617,7 +2687,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -2629,7 +2699,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2639,7 +2709,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-support",
  "log",
@@ -2656,7 +2726,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2671,7 +2741,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2680,9 +2750,10 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-support",
+ "parity-scale-codec",
  "sp-api",
  "sp-runtime",
  "sp-std",
@@ -2872,7 +2943,7 @@ version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
 dependencies = [
- "typenum 1.15.0",
+ "typenum 1.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2881,7 +2952,7 @@ version = "0.14.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
 dependencies = [
- "typenum 1.15.0",
+ "typenum 1.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "version_check",
 ]
 
@@ -2940,17 +3011,23 @@ dependencies = [
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793"
+
 [[package]]
 name = "glob"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "globset"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a"
+checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
 dependencies = [
  "aho-corasick",
  "bstr",
@@ -3003,9 +3080,9 @@ dependencies = [
 
 [[package]]
 name = "handlebars"
-version = "4.3.5"
+version = "4.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433e4ab33f1213cdc25b5fa45c76881240cfe79284cf2b395e8b9e312a30a2fd"
+checksum = "035ef95d03713f2c347a72547b7cd38cbc9af7cd51e6099fb62d586d4a6dee3a"
 dependencies = [
  "log",
  "pest",
@@ -3048,15 +3125,6 @@ dependencies = [
  "ahash",
 ]
 
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
 [[package]]
 name = "heck"
 version = "0.4.0"
@@ -3072,6 +3140,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -3198,9 +3275,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.23.1"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59df7c4e19c950e6e0e868dcc0a300b09a9b88e9ec55bd879ca819087a77355d"
+checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
 dependencies = [
  "http",
  "hyper",
@@ -3369,6 +3446,16 @@ version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074"
 
+[[package]]
+name = "io-lifetimes"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
 [[package]]
 name = "ip_network"
 version = "0.4.1"
@@ -3389,9 +3476,21 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.5.1"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
+
+[[package]]
+name = "is-terminal"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745"
+checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
+dependencies = [
+ "hermit-abi 0.2.6",
+ "io-lifetimes 1.0.4",
+ "rustix 0.36.7",
+ "windows-sys",
+]
 
 [[package]]
 name = "itertools"
@@ -3404,9 +3503,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
+checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
 
 [[package]]
 name = "jobserver"
@@ -3428,9 +3527,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11e017217fcd18da0a25296d3693153dd19c8a6aadab330b3595285d075385d1"
+checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a"
 dependencies = [
  "jsonrpsee-core",
  "jsonrpsee-http-server",
@@ -3443,9 +3542,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-client-transport"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce395539a14d3ad4ec1256fde105abd36a2da25d578a291cabe98f45adfdb111"
+checksum = "8752740ecd374bcbf8b69f3e80b0327942df76f793f8d4e60d3355650c31fb74"
 dependencies = [
  "futures-util",
  "http",
@@ -3464,9 +3563,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-core"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16efcd4477de857d4a2195a45769b2fe9ebb54f3ef5a4221d3b014a4fe33ec0b"
+checksum = "f3dc3e9cf2ba50b7b1d7d76a667619f82846caa39e8e8daa8a4962d74acaddca"
 dependencies = [
  "anyhow",
  "arrayvec 0.7.2",
@@ -3477,6 +3576,7 @@ dependencies = [
  "futures-timer",
  "futures-util",
  "globset",
+ "http",
  "hyper",
  "jsonrpsee-types",
  "lazy_static",
@@ -3489,14 +3589,15 @@ dependencies = [
  "thiserror",
  "tokio",
  "tracing",
+ "tracing-futures",
  "unicase",
 ]
 
 [[package]]
 name = "jsonrpsee-http-server"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdd69efeb3ce2cba767f126872f4eeb4624038a29098e75d77608b2b4345ad03"
+checksum = "03802f0373a38c2420c70b5144742d800b509e2937edc4afb116434f07120117"
 dependencies = [
  "futures-channel",
  "futures-util",
@@ -3507,13 +3608,14 @@ dependencies = [
  "serde_json",
  "tokio",
  "tracing",
+ "tracing-futures",
 ]
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "874cf3f6a027cebf36cae767feca9aa2e8a8f799880e49eb5540819fcbd8eada"
+checksum = "bd67957d4280217247588ac86614ead007b301ca2fa9f19c19f880a536f029e3"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -3523,9 +3625,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bcf76cd316f5d3ad48138085af1f45e2c58c98e02f0779783dbb034d43f7c86"
+checksum = "e290bba767401b646812f608c099b922d8142603c9e73a50fb192d3ac86f4a0d"
 dependencies = [
  "anyhow",
  "beef",
@@ -3537,10 +3639,11 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-ws-client"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee043cb5dd0d51d3eb93432e998d5bae797691a7b10ec4a325e036bcdb48c48a"
+checksum = "6ee5feddd5188e62ac08fcf0e56478138e581509d4730f3f7be9b57dd402a4ff"
 dependencies = [
+ "http",
  "jsonrpsee-client-transport",
  "jsonrpsee-core",
  "jsonrpsee-types",
@@ -3548,12 +3651,13 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-ws-server"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bd2e4d266774a671f8def3794255b28eddd09b18d76e0b913fa439f34588c0a"
+checksum = "d488ba74fb369e5ab68926feb75a483458b88e768d44319f37e4ecad283c7325"
 dependencies = [
  "futures-channel",
  "futures-util",
+ "http",
  "jsonrpsee-core",
  "jsonrpsee-types",
  "serde_json",
@@ -3562,6 +3666,7 @@ dependencies = [
  "tokio-stream",
  "tokio-util",
  "tracing",
+ "tracing-futures",
 ]
 
 [[package]]
@@ -3587,8 +3692,8 @@ dependencies = [
 
 [[package]]
 name = "kusama-runtime"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -3624,6 +3729,7 @@ dependencies = [
  "pallet-multisig",
  "pallet-nomination-pools",
  "pallet-nomination-pools-benchmarking",
+ "pallet-nomination-pools-runtime-api",
  "pallet-offences",
  "pallet-offences-benchmarking",
  "pallet-preimage",
@@ -3679,8 +3785,8 @@ dependencies = [
 
 [[package]]
 name = "kusama-runtime-constants"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -3751,9 +3857,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.138"
+version = "0.2.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
 
 [[package]]
 name = "libfuzzer-sys"
@@ -3786,6 +3892,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "libm"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
+
 [[package]]
 name = "libm"
 version = "0.2.6"
@@ -3941,7 +4053,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74b4b888cfbeb1f5551acd3aa1366e01bf88ede26cc3c4645d0d2d004d5ca7b0"
 dependencies = [
  "asynchronous-codec",
- "base64",
+ "base64 0.13.1",
  "byteorder",
  "bytes",
  "fnv",
@@ -4329,7 +4441,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1"
 dependencies = [
  "arrayref",
- "base64",
+ "base64 0.13.1",
  "digest 0.9.0",
  "hmac-drbg",
  "libsecp256k1-core",
@@ -4338,7 +4450,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "sha2 0.9.9",
- "typenum 1.15.0",
+ "typenum 1.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -4383,9 +4495,9 @@ dependencies = [
 
 [[package]]
 name = "link-cplusplus"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
+checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
 dependencies = [
  "cc",
 ]
@@ -4427,6 +4539,12 @@ version = "0.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+
 [[package]]
 name = "lock_api"
 version = "0.4.9"
@@ -4630,15 +4748,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
-[[package]]
-name = "miniz_oxide"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
-dependencies = [
- "adler",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.6.2"
@@ -4657,13 +4766,13 @@ dependencies = [
  "libc",
  "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.42.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "moonbeam-vrf"
 version = "0.1.0"
-source = "git+https://github.com/zeitgeistpm/moonbeam?branch=polkadot-v0.9.26#5d24d606a8a2cfeb75a3ab95b77087ebe6522cb0"
+source = "git+https://github.com/zeitgeistpm/moonbeam?tag=v0.27.2-a#cf8094af82c8324378f18ac4b4a647cc06705c33"
 dependencies = [
  "nimbus-primitives",
  "parity-scale-codec",
@@ -4778,7 +4887,7 @@ dependencies = [
  "rand 0.8.5",
  "rand_distr",
  "simba",
- "typenum 1.15.0",
+ "typenum 1.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -4876,7 +4985,7 @@ dependencies = [
 [[package]]
 name = "nimbus-consensus"
 version = "0.9.0"
-source = "git+https://github.com/zeitgeistpm/nimbus?branch=polkadot-v0.9.26#34792127cfe1a3a446b097b52fcd41830cdd24c5"
+source = "git+https://github.com/zeitgeistpm/nimbus?branch=moonbeam-polkadot-v0.9.29#9cb2d9280c4f99bf4ea5acbe57b731dfad1c0e23"
 dependencies = [
  "async-trait",
  "cumulus-client-consensus-common",
@@ -4907,7 +5016,7 @@ dependencies = [
 [[package]]
 name = "nimbus-primitives"
 version = "0.9.0"
-source = "git+https://github.com/zeitgeistpm/nimbus?branch=polkadot-v0.9.26#34792127cfe1a3a446b097b52fcd41830cdd24c5"
+source = "git+https://github.com/zeitgeistpm/nimbus?branch=moonbeam-polkadot-v0.9.29#9cb2d9280c4f99bf4ea5acbe57b731dfad1c0e23"
 dependencies = [
  "async-trait",
  "frame-benchmarking",
@@ -4947,9 +5056,9 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
 
 [[package]]
 name = "nom"
-version = "7.1.1"
+version = "7.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
 dependencies = [
  "memchr",
  "minimal-lexical",
@@ -4968,9 +5077,9 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19"
+checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d"
 dependencies = [
  "num-traits",
 ]
@@ -5025,16 +5134,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
 dependencies = [
  "autocfg",
- "libm",
+ "libm 0.2.6",
 ]
 
 [[package]]
 name = "num_cpus"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
+checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.2.6",
  "libc",
 ]
 
@@ -5052,18 +5161,18 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.29.0"
+version = "0.30.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
+checksum = "2b8c786513eb403643f2a88c244c2aaa270ef2153f55094587d0c48a3cf22a83"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
+checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
 
 [[package]]
 name = "opaque-debug"
@@ -5086,7 +5195,7 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 [[package]]
 name = "orchestra"
 version = "0.0.1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "async-trait",
  "dyn-clonable",
@@ -5102,7 +5211,7 @@ dependencies = [
 [[package]]
 name = "orchestra-proc-macro"
 version = "0.0.1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "expander 0.0.6",
  "itertools",
@@ -5125,7 +5234,7 @@ dependencies = [
 [[package]]
 name = "orml-asset-registry"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8"
+source = "git+https://github.com/zeitgeistpm/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.29#d231a39d4583445d1af7326a9e6e78ba744ce6e9"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5144,7 +5253,7 @@ dependencies = [
 [[package]]
 name = "orml-benchmarking"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8"
+source = "git+https://github.com/zeitgeistpm/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.29#d231a39d4583445d1af7326a9e6e78ba744ce6e9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5164,7 +5273,7 @@ dependencies = [
 [[package]]
 name = "orml-currencies"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8"
+source = "git+https://github.com/zeitgeistpm/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.29#d231a39d4583445d1af7326a9e6e78ba744ce6e9"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5181,7 +5290,7 @@ dependencies = [
 [[package]]
 name = "orml-tokens"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8"
+source = "git+https://github.com/zeitgeistpm/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.29#d231a39d4583445d1af7326a9e6e78ba744ce6e9"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5196,7 +5305,7 @@ dependencies = [
 [[package]]
 name = "orml-traits"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8"
+source = "git+https://github.com/zeitgeistpm/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.29#d231a39d4583445d1af7326a9e6e78ba744ce6e9"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -5214,7 +5323,7 @@ dependencies = [
 [[package]]
 name = "orml-unknown-tokens"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8"
+source = "git+https://github.com/zeitgeistpm/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.29#d231a39d4583445d1af7326a9e6e78ba744ce6e9"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5229,7 +5338,7 @@ dependencies = [
 [[package]]
 name = "orml-utilities"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8"
+source = "git+https://github.com/zeitgeistpm/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.29#d231a39d4583445d1af7326a9e6e78ba744ce6e9"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -5243,7 +5352,7 @@ dependencies = [
 [[package]]
 name = "orml-xcm-support"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8"
+source = "git+https://github.com/zeitgeistpm/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.29#d231a39d4583445d1af7326a9e6e78ba744ce6e9"
 dependencies = [
  "frame-support",
  "orml-traits",
@@ -5257,7 +5366,7 @@ dependencies = [
 [[package]]
 name = "orml-xtokens"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8"
+source = "git+https://github.com/zeitgeistpm/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.29#d231a39d4583445d1af7326a9e6e78ba744ce6e9"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -5290,10 +5399,20 @@ dependencies = [
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "packed_simd_2"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libm 0.1.4",
+]
+
 [[package]]
 name = "pallet-aura"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5309,7 +5428,7 @@ dependencies = [
 [[package]]
 name = "pallet-author-inherent"
 version = "0.9.0"
-source = "git+https://github.com/zeitgeistpm/nimbus?branch=polkadot-v0.9.26#34792127cfe1a3a446b097b52fcd41830cdd24c5"
+source = "git+https://github.com/zeitgeistpm/nimbus?branch=moonbeam-polkadot-v0.9.29#9cb2d9280c4f99bf4ea5acbe57b731dfad1c0e23"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5329,7 +5448,7 @@ dependencies = [
 [[package]]
 name = "pallet-author-mapping"
 version = "2.0.5"
-source = "git+https://github.com/zeitgeistpm/moonbeam?branch=polkadot-v0.9.26#5d24d606a8a2cfeb75a3ab95b77087ebe6522cb0"
+source = "git+https://github.com/zeitgeistpm/moonbeam?tag=v0.27.2-a#cf8094af82c8324378f18ac4b4a647cc06705c33"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5347,7 +5466,7 @@ dependencies = [
 [[package]]
 name = "pallet-author-slot-filter"
 version = "0.9.0"
-source = "git+https://github.com/zeitgeistpm/nimbus?branch=polkadot-v0.9.26#34792127cfe1a3a446b097b52fcd41830cdd24c5"
+source = "git+https://github.com/zeitgeistpm/nimbus?branch=moonbeam-polkadot-v0.9.29#9cb2d9280c4f99bf4ea5acbe57b731dfad1c0e23"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5365,7 +5484,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5381,7 +5500,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5396,7 +5515,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5420,7 +5539,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5440,7 +5559,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5455,7 +5574,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "beefy-primitives",
  "frame-support",
@@ -5471,7 +5590,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "beefy-merkle-tree",
  "beefy-primitives",
@@ -5494,7 +5613,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5512,7 +5631,7 @@ dependencies = [
 [[package]]
 name = "pallet-child-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5531,7 +5650,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5548,7 +5667,7 @@ dependencies = [
 [[package]]
 name = "pallet-crowdloan-rewards"
 version = "0.6.0"
-source = "git+https://github.com/zeitgeistpm/crowdloan-rewards?branch=polkadot-v0.9.26#1dab0b1971f80c707e3fa4ae59d597d099f23980"
+source = "git+https://github.com/zeitgeistpm/crowdloan-rewards?branch=moonbeam-polkadot-v0.9.29#d2c6eb95def2208af2497bbe7e0459b74586762d"
 dependencies = [
  "ed25519-dalek",
  "frame-benchmarking",
@@ -5570,7 +5689,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5586,7 +5705,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5603,13 +5722,13 @@ dependencies = [
  "sp-runtime",
  "sp-std",
  "static_assertions",
- "strum 0.23.0",
+ "strum",
 ]
 
 [[package]]
 name = "pallet-election-provider-support-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5622,7 +5741,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5640,7 +5759,7 @@ dependencies = [
 [[package]]
 name = "pallet-gilt"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5655,7 +5774,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5678,7 +5797,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -5694,7 +5813,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5714,7 +5833,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5731,7 +5850,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5748,7 +5867,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "ckb-merkle-mountain-range",
  "frame-benchmarking",
@@ -5766,7 +5885,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -5781,7 +5900,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5796,7 +5915,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5813,7 +5932,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-benchmarking"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5829,10 +5948,20 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "pallet-nomination-pools-runtime-api"
+version = "1.0.0-dev"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
+dependencies = [
+ "parity-scale-codec",
+ "sp-api",
+ "sp-std",
+]
+
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5849,7 +5978,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5872,7 +6001,7 @@ dependencies = [
 [[package]]
 name = "pallet-parachain-staking"
 version = "3.0.0"
-source = "git+https://github.com/zeitgeistpm/moonbeam?branch=polkadot-v0.9.26#5d24d606a8a2cfeb75a3ab95b77087ebe6522cb0"
+source = "git+https://github.com/zeitgeistpm/moonbeam?tag=v0.27.2-a#cf8094af82c8324378f18ac4b4a647cc06705c33"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5890,7 +6019,7 @@ dependencies = [
 [[package]]
 name = "pallet-preimage"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5906,7 +6035,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5921,7 +6050,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5935,7 +6064,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5950,7 +6079,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5966,7 +6095,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5987,7 +6116,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6003,7 +6132,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6017,7 +6146,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -6040,7 +6169,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -6051,7 +6180,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -6060,7 +6189,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6074,7 +6203,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6092,7 +6221,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6111,7 +6240,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6127,7 +6256,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
@@ -6142,7 +6271,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -6153,7 +6282,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6170,7 +6299,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6186,7 +6315,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6200,8 +6329,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-xcm"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6218,8 +6347,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-xcm-benchmarks"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6236,7 +6365,7 @@ dependencies = [
 [[package]]
 name = "parachain-info"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -6267,13 +6396,14 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "3.2.1"
+version = "3.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "366e44391a8af4cfd6002ef6ba072bae071a96aafca98d7d448a34c5dca38b6a"
+checksum = "e7ab01d0f889e957861bc65888d5ccbe82c158d0270136ba46820d43837cdf72"
 dependencies = [
  "arrayvec 0.7.2",
  "bitvec",
  "byte-slice-cast",
+ "bytes",
  "impl-trait-for-tuples",
  "parity-scale-codec-derive",
  "serde",
@@ -6281,9 +6411,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "3.1.3"
+version = "3.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9299338969a3d2f491d65f140b00ddec470858402f888af98e8642fb5e8965cd"
+checksum = "86b26a931f824dd4eca30b3e43bb4f31cd5f0d3a403c5f5ff27106b805bfde7b"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -6353,7 +6483,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
  "instant",
  "lock_api",
- "parking_lot_core 0.8.5",
+ "parking_lot_core 0.8.6",
 ]
 
 [[package]]
@@ -6363,14 +6493,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.5",
+ "parking_lot_core 0.9.6",
 ]
 
 [[package]]
 name = "parking_lot_core"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
 dependencies = [
  "cfg-if 1.0.0",
  "instant",
@@ -6382,22 +6512,22 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.5"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
+checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-sys 0.42.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "paste"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1"
+checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
 
 [[package]]
 name = "pbkdf2"
@@ -6431,9 +6561,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
 
 [[package]]
 name = "pest"
-version = "2.5.1"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0"
+checksum = "4257b4a04d91f7e9e6290be5d3da4804dd5784fafde3a497d73eb2b4a158c30a"
 dependencies = [
  "thiserror",
  "ucd-trie",
@@ -6441,9 +6571,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.5.1"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdc078600d06ff90d4ed238f0119d84ab5d43dbaad278b0e33a8820293b32344"
+checksum = "241cda393b0cdd65e62e07e12454f1f25d57017dcc514b1514cd3c4645e3a0a6"
 dependencies = [
  "pest",
  "pest_generator",
@@ -6451,9 +6581,9 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.5.1"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28a1af60b1c4148bb269006a750cff8e2ea36aff34d2d96cf7be0b14d1bed23c"
+checksum = "46b53634d8c8196302953c74d5352f33d0c512a9499bd2ce468fc9f4128fa27c"
 dependencies = [
  "pest",
  "pest_meta",
@@ -6464,13 +6594,13 @@ dependencies = [
 
 [[package]]
 name = "pest_meta"
-version = "2.5.1"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fec8605d59fc2ae0c6c1aefc0c7c7a9769732017c0ce07f7a9cfffa7b4404f20"
+checksum = "0ef4f1332a8d4678b41966bb4cc1d0676880e84183a1ecc3f4b69f03e99c7a51"
 dependencies = [
  "once_cell",
  "pest",
- "sha1",
+ "sha2 0.10.6",
 ]
 
 [[package]]
@@ -6533,10 +6663,16 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94"
 
+[[package]]
+name = "platforms"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630"
+
 [[package]]
 name = "polkadot-approval-distribution"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "futures 0.3.25",
  "polkadot-node-network-protocol",
@@ -6550,8 +6686,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-availability-bitfield-distribution"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "futures 0.3.25",
  "polkadot-node-network-protocol",
@@ -6564,8 +6700,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-availability-distribution"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "derive_more",
  "fatality",
@@ -6587,8 +6723,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-availability-recovery"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "fatality",
  "futures 0.3.25",
@@ -6608,8 +6744,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-cli"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "clap",
  "frame-benchmarking-cli",
@@ -6625,6 +6761,7 @@ dependencies = [
  "sc-sysinfo",
  "sc-tracing",
  "sp-core",
+ "sp-keyring",
  "sp-trie",
  "substrate-build-script-utils",
  "thiserror",
@@ -6633,8 +6770,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-client"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "beefy-primitives",
  "frame-benchmarking",
@@ -6673,8 +6810,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-collator-protocol"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "always-assert",
  "fatality",
@@ -6694,8 +6831,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-core-primitives"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
@@ -6707,8 +6844,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-dispute-distribution"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "derive_more",
  "fatality",
@@ -6730,8 +6867,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-erasure-coding"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-primitives",
@@ -6744,8 +6881,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-gossip-support"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "futures 0.3.25",
  "futures-timer",
@@ -6764,12 +6901,13 @@ dependencies = [
 
 [[package]]
 name = "polkadot-network-bridge"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "always-assert",
  "async-trait",
  "bytes",
+ "fatality",
  "futures 0.3.25",
  "parity-scale-codec",
  "parking_lot 0.12.1",
@@ -6779,14 +6917,16 @@ dependencies = [
  "polkadot-overseer",
  "polkadot-primitives",
  "sc-network",
+ "sc-network-common",
  "sp-consensus",
+ "thiserror",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-node-collation-generation"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "futures 0.3.25",
  "parity-scale-codec",
@@ -6803,8 +6943,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-approval-voting"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "bitvec",
  "derive_more",
@@ -6832,8 +6972,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-av-store"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "bitvec",
  "futures 0.3.25",
@@ -6852,8 +6992,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-backing"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "bitvec",
  "fatality",
@@ -6871,8 +7011,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-bitfield-signing"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "futures 0.3.25",
  "polkadot-node-subsystem",
@@ -6886,8 +7026,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-candidate-validation"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "async-trait",
  "futures 0.3.25",
@@ -6904,8 +7044,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-chain-api"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "futures 0.3.25",
  "polkadot-node-subsystem",
@@ -6919,8 +7059,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-chain-selection"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "futures 0.3.25",
  "futures-timer",
@@ -6936,8 +7076,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-dispute-coordinator"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "fatality",
  "futures 0.3.25",
@@ -6955,8 +7095,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-parachains-inherent"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "async-trait",
  "futures 0.3.25",
@@ -6972,8 +7112,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-provisioner"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "bitvec",
  "fatality",
@@ -6990,8 +7130,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-pvf"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "always-assert",
  "assert_matches",
@@ -7022,8 +7162,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-pvf-checker"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "futures 0.3.25",
  "polkadot-node-primitives",
@@ -7038,25 +7178,24 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-runtime-api"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "futures 0.3.25",
  "memory-lru",
  "parity-util-mem",
  "polkadot-node-subsystem",
+ "polkadot-node-subsystem-types",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "sp-api",
- "sp-authority-discovery",
  "sp-consensus-babe",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-node-jaeger"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "async-std",
  "lazy_static",
@@ -7073,8 +7212,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-metrics"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "bs58",
  "futures 0.3.25",
@@ -7092,13 +7231,14 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-network-protocol"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "async-trait",
  "derive_more",
  "fatality",
  "futures 0.3.25",
+ "hex",
  "parity-scale-codec",
  "polkadot-node-jaeger",
  "polkadot-node-primitives",
@@ -7106,15 +7246,15 @@ dependencies = [
  "rand 0.8.5",
  "sc-authority-discovery",
  "sc-network",
- "strum 0.24.1",
+ "strum",
  "thiserror",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-node-primitives"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "bounded-vec",
  "futures 0.3.25",
@@ -7135,8 +7275,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-subsystem"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-node-subsystem-types",
@@ -7145,9 +7285,10 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-subsystem-types"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
+ "async-trait",
  "derive_more",
  "futures 0.3.25",
  "orchestra",
@@ -7158,14 +7299,17 @@ dependencies = [
  "polkadot-statement-table",
  "sc-network",
  "smallvec",
+ "sp-api",
+ "sp-authority-discovery",
+ "sp-consensus-babe",
  "substrate-prometheus-endpoint",
  "thiserror",
 ]
 
 [[package]]
 name = "polkadot-node-subsystem-util"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7197,9 +7341,10 @@ dependencies = [
 
 [[package]]
 name = "polkadot-overseer"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
+ "async-trait",
  "futures 0.3.25",
  "futures-timer",
  "lru 0.7.8",
@@ -7219,8 +7364,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-parachain"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "derive_more",
  "frame-support",
@@ -7236,10 +7381,10 @@ dependencies = [
 
 [[package]]
 name = "polkadot-performance-test"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
- "env_logger",
+ "env_logger 0.9.3",
  "kusama-runtime",
  "log",
  "polkadot-erasure-coding",
@@ -7251,8 +7396,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-primitives"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "bitvec",
  "frame-system",
@@ -7281,8 +7426,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-rpc"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "beefy-gadget",
  "beefy-gadget-rpc",
@@ -7313,8 +7458,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -7346,6 +7491,9 @@ dependencies = [
  "pallet-indices",
  "pallet-membership",
  "pallet-multisig",
+ "pallet-nomination-pools",
+ "pallet-nomination-pools-benchmarking",
+ "pallet-nomination-pools-runtime-api",
  "pallet-offences",
  "pallet-offences-benchmarking",
  "pallet-preimage",
@@ -7398,8 +7546,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-common"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -7445,8 +7593,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-constants"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -7457,8 +7605,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-metrics"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "bs58",
  "parity-scale-codec",
@@ -7469,8 +7617,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-parachains"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "bitflags",
  "bitvec",
@@ -7512,12 +7660,13 @@ dependencies = [
 
 [[package]]
 name = "polkadot-service"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "async-trait",
  "beefy-gadget",
  "beefy-primitives",
+ "frame-support",
  "frame-system-rpc-runtime-api",
  "futures 0.3.25",
  "hex-literal",
@@ -7575,11 +7724,11 @@ dependencies = [
  "sc-consensus",
  "sc-consensus-babe",
  "sc-consensus-slots",
- "sc-consensus-uncles",
  "sc-executor",
  "sc-finality-grandpa",
  "sc-keystore",
  "sc-network",
+ "sc-network-common",
  "sc-offchain",
  "sc-service",
  "sc-sync-state-rpc",
@@ -7615,8 +7764,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-statement-distribution"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "arrayvec 0.5.2",
  "fatality",
@@ -7636,8 +7785,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-statement-table"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
@@ -7646,8 +7795,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-test-runtime"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -7707,8 +7856,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-test-service"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "frame-benchmarking",
  "frame-system",
@@ -7737,6 +7886,7 @@ dependencies = [
  "sc-executor",
  "sc-finality-grandpa",
  "sc-network",
+ "sc-network-common",
  "sc-service",
  "sc-tracing",
  "sc-transaction-pool",
@@ -7760,16 +7910,16 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "2.5.1"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "166ca89eb77fd403230b9c156612965a81e094ec6ec3aa13663d4c8b113fa748"
+checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6"
 dependencies = [
  "autocfg",
  "cfg-if 1.0.0",
  "libc",
  "log",
  "wepoll-ffi",
- "windows-sys 0.42.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -7817,7 +7967,7 @@ dependencies = [
 [[package]]
 name = "prioritized-metered-channel"
 version = "0.2.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "coarsetime",
  "crossbeam-queue",
@@ -7866,9 +8016,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.47"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
 dependencies = [
  "unicode-ident",
 ]
@@ -7929,7 +8079,7 @@ dependencies = [
  "bytes",
  "cfg-if 1.0.0",
  "cmake",
- "heck 0.4.0",
+ "heck",
  "itertools",
  "lazy_static",
  "log",
@@ -8006,9 +8156,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.21"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
 dependencies = [
  "proc-macro2",
 ]
@@ -8127,11 +8277,10 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
 
 [[package]]
 name = "rayon"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b"
+checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"
 dependencies = [
- "crossbeam-deque",
  "either",
  "rayon-core",
 ]
@@ -8183,18 +8332,18 @@ dependencies = [
 
 [[package]]
 name = "ref-cast"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b15debb4f9d60d767cd8ca9ef7abb2452922f3214671ff052defc7f3502c44"
+checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed"
 dependencies = [
  "ref-cast-impl",
 ]
 
 [[package]]
 name = "ref-cast-impl"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abfa8511e9e94fd3de6585a3d3cd00e01ed556dc9814829280af0e8dc72a8f36"
+checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8215,9 +8364,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.7.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
+checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -8254,9 +8403,9 @@ dependencies = [
 [[package]]
 name = "remote-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
- "env_logger",
+ "env_logger 0.9.3",
  "jsonrpsee",
  "log",
  "parity-scale-codec",
@@ -8287,12 +8436,6 @@ dependencies = [
  "quick-error",
 ]
 
-[[package]]
-name = "retain_mut"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0"
-
 [[package]]
 name = "rfc6979"
 version = "0.1.0"
@@ -8331,8 +8474,8 @@ dependencies = [
 
 [[package]]
 name = "rococo-runtime"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "beefy-merkle-tree",
  "beefy-primitives",
@@ -8400,8 +8543,8 @@ dependencies = [
 
 [[package]]
 name = "rococo-runtime-constants"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -8412,11 +8555,12 @@ dependencies = [
 
 [[package]]
 name = "rpassword"
-version = "5.0.1"
+version = "7.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb"
+checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322"
 dependencies = [
  "libc",
+ "rtoolbox",
  "winapi",
 ]
 
@@ -8435,6 +8579,16 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "rtoolbox"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.21"
@@ -8468,7 +8622,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.14",
+ "semver 1.0.16",
 ]
 
 [[package]]
@@ -8496,14 +8650,28 @@ dependencies = [
  "io-lifetimes 0.7.5",
  "libc",
  "linux-raw-sys 0.0.46",
- "windows-sys 0.42.0",
+ "windows-sys",
+]
+
+[[package]]
+name = "rustix"
+version = "0.36.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
+dependencies = [
+ "bitflags",
+ "errno",
+ "io-lifetimes 1.0.4",
+ "libc",
+ "linux-raw-sys 0.1.4",
+ "windows-sys",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.20.7"
+version = "0.20.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c"
+checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
 dependencies = [
  "log",
  "ring",
@@ -8525,18 +8693,18 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55"
+checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
 dependencies = [
- "base64",
+ "base64 0.21.0",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
+checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
 
 [[package]]
 name = "rw-stream-sink"
@@ -8551,9 +8719,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
+checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
 
 [[package]]
 name = "safe-mix"
@@ -8585,7 +8753,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "log",
  "sp-core",
@@ -8596,7 +8764,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "async-trait",
  "futures 0.3.25",
@@ -8609,7 +8777,7 @@ dependencies = [
  "prost-build",
  "rand 0.7.3",
  "sc-client-api",
- "sc-network",
+ "sc-network-common",
  "sp-api",
  "sp-authority-discovery",
  "sp-blockchain",
@@ -8623,7 +8791,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "futures 0.3.25",
  "futures-timer",
@@ -8646,7 +8814,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -8662,13 +8830,13 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "impl-trait-for-tuples",
  "memmap2",
  "parity-scale-codec",
  "sc-chain-spec-derive",
- "sc-network",
+ "sc-network-common",
  "sc-telemetry",
  "serde",
  "serde_json",
@@ -8679,7 +8847,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -8690,7 +8858,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "chrono",
  "clap",
@@ -8729,7 +8897,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "fnv",
  "futures 0.3.25",
@@ -8757,7 +8925,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -8782,7 +8950,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "async-trait",
  "futures 0.3.25",
@@ -8806,7 +8974,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "async-trait",
  "futures 0.3.25",
@@ -8835,7 +9003,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -8848,7 +9016,6 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "rand 0.7.3",
- "retain_mut",
  "sc-client-api",
  "sc-consensus",
  "sc-consensus-epochs",
@@ -8878,7 +9045,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "futures 0.3.25",
  "jsonrpsee",
@@ -8900,7 +9067,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -8913,7 +9080,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-manual-seal"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -8947,7 +9114,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "async-trait",
  "futures 0.3.25",
@@ -8969,21 +9136,10 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "sc-consensus-uncles"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
-dependencies = [
- "sc-client-api",
- "sp-authorship",
- "sp-runtime",
- "thiserror",
-]
-
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "lazy_static",
  "lru 0.7.8",
@@ -9010,14 +9166,13 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "environmental",
  "parity-scale-codec",
  "sc-allocator",
  "sp-maybe-compressed-blob",
  "sp-sandbox",
- "sp-serializer",
  "sp-wasm-interface",
  "thiserror",
  "wasm-instrument",
@@ -9027,7 +9182,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9042,7 +9197,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -9050,6 +9205,7 @@ dependencies = [
  "once_cell",
  "parity-scale-codec",
  "parity-wasm 0.42.2",
+ "rustix 0.33.7",
  "rustix 0.35.13",
  "sc-allocator",
  "sc-executor-common",
@@ -9062,7 +9218,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "ahash",
  "async-trait",
@@ -9082,6 +9238,7 @@ dependencies = [
  "sc-consensus",
  "sc-keystore",
  "sc-network",
+ "sc-network-common",
  "sc-network-gossip",
  "sc-telemetry",
  "sc-utils",
@@ -9102,7 +9259,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "finality-grandpa",
  "futures 0.3.25",
@@ -9123,7 +9280,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "ansi_term",
  "futures 0.3.25",
@@ -9131,7 +9288,7 @@ dependencies = [
  "log",
  "parity-util-mem",
  "sc-client-api",
- "sc-network",
+ "sc-network-common",
  "sc-transaction-pool-api",
  "sp-blockchain",
  "sp-runtime",
@@ -9140,7 +9297,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "async-trait",
  "hex",
@@ -9155,7 +9312,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "async-trait",
  "asynchronous-codec",
@@ -9184,8 +9341,6 @@ dependencies = [
  "sc-client-api",
  "sc-consensus",
  "sc-network-common",
- "sc-network-light",
- "sc-network-sync",
  "sc-peerset",
  "sc-utils",
  "serde",
@@ -9195,7 +9350,6 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-core",
- "sp-finality-grandpa",
  "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
@@ -9207,20 +9361,30 @@ dependencies = [
 [[package]]
 name = "sc-network-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
+ "async-trait",
+ "bitflags",
+ "bytes",
  "futures 0.3.25",
  "libp2p",
  "parity-scale-codec",
  "prost-build",
+ "sc-consensus",
  "sc-peerset",
+ "serde",
  "smallvec",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-finality-grandpa",
+ "sp-runtime",
+ "thiserror",
 ]
 
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "ahash",
  "futures 0.3.25",
@@ -9228,7 +9392,8 @@ dependencies = [
  "libp2p",
  "log",
  "lru 0.7.8",
- "sc-network",
+ "sc-network-common",
+ "sc-peerset",
  "sp-runtime",
  "substrate-prometheus-endpoint",
  "tracing",
@@ -9237,9 +9402,10 @@ dependencies = [
 [[package]]
 name = "sc-network-light"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "futures 0.3.25",
+ "hex",
  "libp2p",
  "log",
  "parity-scale-codec",
@@ -9257,12 +9423,11 @@ dependencies = [
 [[package]]
 name = "sc-network-sync"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
- "bitflags",
- "either",
  "fork-tree",
  "futures 0.3.25",
+ "hex",
  "libp2p",
  "log",
  "lru 0.7.8",
@@ -9286,7 +9451,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "bytes",
  "fnv",
@@ -9295,13 +9460,15 @@ dependencies = [
  "hex",
  "hyper",
  "hyper-rustls",
+ "libp2p",
  "num_cpus",
  "once_cell",
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "rand 0.7.3",
  "sc-client-api",
- "sc-network",
+ "sc-network-common",
+ "sc-peerset",
  "sc-utils",
  "sp-api",
  "sp-core",
@@ -9314,7 +9481,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "futures 0.3.25",
  "libp2p",
@@ -9327,7 +9494,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -9336,7 +9503,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "futures 0.3.25",
  "hash-db",
@@ -9366,7 +9533,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "futures 0.3.25",
  "jsonrpsee",
@@ -9389,7 +9556,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "futures 0.3.25",
  "jsonrpsee",
@@ -9402,7 +9569,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "async-trait",
  "directories",
@@ -9427,6 +9594,8 @@ dependencies = [
  "sc-keystore",
  "sc-network",
  "sc-network-common",
+ "sc-network-light",
+ "sc-network-sync",
  "sc-offchain",
  "sc-rpc",
  "sc-rpc-server",
@@ -9467,7 +9636,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9481,7 +9650,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -9500,7 +9669,7 @@ dependencies = [
 [[package]]
 name = "sc-sysinfo"
 version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "futures 0.3.25",
  "libc",
@@ -9519,7 +9688,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "chrono",
  "futures 0.3.25",
@@ -9537,7 +9706,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "ansi_term",
  "atty",
@@ -9568,7 +9737,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -9579,7 +9748,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "futures 0.3.25",
  "futures-timer",
@@ -9588,7 +9757,6 @@ dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
  "parking_lot 0.12.1",
- "retain_mut",
  "sc-client-api",
  "sc-transaction-pool-api",
  "sc-utils",
@@ -9606,7 +9774,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "futures 0.3.25",
  "log",
@@ -9619,7 +9787,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "futures 0.3.25",
  "futures-timer",
@@ -9631,9 +9799,9 @@ dependencies = [
 
 [[package]]
 name = "scale-info"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d8a765117b237ef233705cc2cc4c6a27fccd46eea6ef0c8c6dae5f3ef407f8"
+checksum = "001cf62ece89779fd16105b5f515ad0e5cedcd5440d3dd806bb067978e7c3608"
 dependencies = [
  "bitvec",
  "cfg-if 1.0.0",
@@ -9645,9 +9813,9 @@ dependencies = [
 
 [[package]]
 name = "scale-info-derive"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdcd47b380d8c4541044e341dcd9475f55ba37ddc50c908d945fc036a8642496"
+checksum = "303959cf613a6f6efd19ed4b4ad5bf79966a13352716299ad532cfb115f4205c"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -9657,12 +9825,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.20"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
+checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
 dependencies = [
- "lazy_static",
- "windows-sys 0.36.1",
+ "windows-sys",
 ]
 
 [[package]]
@@ -9691,9 +9858,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "scratch"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
+checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
 
 [[package]]
 name = "sct"
@@ -9719,18 +9886,18 @@ dependencies = [
 
 [[package]]
 name = "secp256k1"
-version = "0.21.3"
+version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260"
+checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62"
 dependencies = [
  "secp256k1-sys",
 ]
 
 [[package]]
 name = "secp256k1-sys"
-version = "0.4.2"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957da2573cde917463ece3570eab4a0b3f19de6f1646cde62e6fd3868f566036"
+checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b"
 dependencies = [
  "cc",
 ]
@@ -9746,9 +9913,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
+checksum = "645926f31b250a2dca3c232496c2d898d91036e45ca0e97e0e2390c54e11be36"
 dependencies = [
  "bitflags",
  "core-foundation",
@@ -9759,9 +9926,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.6.1"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
+checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -9787,9 +9954,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.14"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
+checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
 dependencies = [
  "serde",
 ]
@@ -9802,18 +9969,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.149"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055"
+checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.149"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4"
+checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9822,9 +9989,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.89"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
+checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
 dependencies = [
  "itoa",
  "ryu",
@@ -9843,7 +10010,7 @@ dependencies = [
 [[package]]
 name = "session-keys-primitives"
 version = "0.1.0"
-source = "git+https://github.com/zeitgeistpm/moonbeam?branch=polkadot-v0.9.26#5d24d606a8a2cfeb75a3ab95b77087ebe6522cb0"
+source = "git+https://github.com/zeitgeistpm/moonbeam?tag=v0.27.2-a#cf8094af82c8324378f18ac4b4a647cc06705c33"
 dependencies = [
  "async-trait",
  "frame-support",
@@ -9874,17 +10041,6 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
-[[package]]
-name = "sha1"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest 0.10.6",
-]
-
 [[package]]
 name = "sha2"
 version = "0.8.2"
@@ -10004,8 +10160,8 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec"
 
 [[package]]
 name = "slot-range-helper"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "enumn",
  "parity-scale-codec",
@@ -10044,7 +10200,7 @@ dependencies = [
  "aes-gcm",
  "blake2",
  "chacha20poly1305",
- "curve25519-dalek 4.0.0-pre.1",
+ "curve25519-dalek 4.0.0-pre.5",
  "rand_core 0.6.4",
  "ring",
  "rustc_version 0.4.0",
@@ -10068,7 +10224,7 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2"
 dependencies = [
- "base64",
+ "base64 0.13.1",
  "bytes",
  "flate2",
  "futures 0.3.25",
@@ -10081,7 +10237,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "hash-db",
  "log",
@@ -10091,6 +10247,7 @@ dependencies = [
  "sp-runtime",
  "sp-state-machine",
  "sp-std",
+ "sp-trie",
  "sp-version",
  "thiserror",
 ]
@@ -10098,7 +10255,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "blake2",
  "proc-macro-crate",
@@ -10110,7 +10267,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10123,7 +10280,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -10138,7 +10295,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10151,7 +10308,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -10163,7 +10320,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -10175,7 +10332,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "futures 0.3.25",
  "log",
@@ -10193,7 +10350,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "async-trait",
  "futures 0.3.25",
@@ -10212,7 +10369,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -10230,7 +10387,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "async-trait",
  "merlin",
@@ -10253,7 +10410,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10267,7 +10424,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10280,14 +10437,14 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "base58",
  "bitflags",
  "blake2-rfc",
  "byteorder",
  "dyn-clonable",
- "ed25519-dalek",
+ "ed25519-zebra",
  "futures 0.3.25",
  "hash-db",
  "hash256-std-hasher",
@@ -10326,7 +10483,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "blake2",
  "byteorder",
@@ -10340,7 +10497,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10351,7 +10508,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.1",
@@ -10360,7 +10517,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10370,7 +10527,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -10381,7 +10538,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -10399,7 +10556,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -10413,8 +10570,10 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
+ "bytes",
+ "ed25519-dalek",
  "futures 0.3.25",
  "hash-db",
  "libsecp256k1",
@@ -10438,18 +10597,18 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "lazy_static",
  "sp-core",
  "sp-runtime",
- "strum 0.23.0",
+ "strum",
 ]
 
 [[package]]
 name = "sp-keystore"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "async-trait",
  "futures 0.3.25",
@@ -10466,7 +10625,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "thiserror",
  "zstd",
@@ -10475,7 +10634,7 @@ dependencies = [
 [[package]]
 name = "sp-mmr-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -10490,7 +10649,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10504,7 +10663,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -10514,7 +10673,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -10524,7 +10683,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -10534,7 +10693,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -10556,8 +10715,9 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
+ "bytes",
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "primitive-types",
@@ -10573,7 +10733,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -10585,7 +10745,7 @@ dependencies = [
 [[package]]
 name = "sp-sandbox"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -10596,19 +10756,10 @@ dependencies = [
  "wasmi",
 ]
 
-[[package]]
-name = "sp-serializer"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
-dependencies = [
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10622,7 +10773,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10633,7 +10784,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "hash-db",
  "log",
@@ -10655,12 +10806,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 
 [[package]]
 name = "sp-storage"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -10673,7 +10824,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "log",
  "sp-core",
@@ -10686,7 +10837,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "async-trait",
  "futures-timer",
@@ -10702,7 +10853,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -10714,7 +10865,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -10723,7 +10874,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "async-trait",
  "log",
@@ -10739,15 +10890,22 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
+ "ahash",
  "hash-db",
+ "hashbrown 0.12.3",
+ "lazy_static",
+ "lru 0.7.8",
  "memory-db",
+ "nohash-hasher",
  "parity-scale-codec",
+ "parking_lot 0.12.1",
  "scale-info",
  "sp-core",
  "sp-std",
  "thiserror",
+ "tracing",
  "trie-db",
  "trie-root",
 ]
@@ -10755,7 +10913,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -10772,7 +10930,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -10783,7 +10941,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "impl-trait-for-tuples",
  "log",
@@ -10801,9 +10959,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "ss58-registry"
-version = "1.35.0"
+version = "1.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa0813c10b9dbdc842c2305f949f724c64866e4ef4d09c9151e96f6a2106773c"
+checksum = "d44528162f980c0e03c71e005d334332c8da0aec9f2b0b4bdc557ed4a9f24776"
 dependencies = [
  "Inflector",
  "num-format",
@@ -10870,35 +11028,13 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
-[[package]]
-name = "strum"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb"
-dependencies = [
- "strum_macros 0.23.1",
-]
-
 [[package]]
 name = "strum"
 version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
 dependencies = [
- "strum_macros 0.24.3",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38"
-dependencies = [
- "heck 0.3.3",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn",
+ "strum_macros",
 ]
 
 [[package]]
@@ -10907,7 +11043,7 @@ version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
 dependencies = [
- "heck 0.4.0",
+ "heck",
  "proc-macro2",
  "quote",
  "rustversion",
@@ -10930,9 +11066,9 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
- "platforms",
+ "platforms 2.0.0",
 ]
 
 [[package]]
@@ -10943,13 +11079,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "typenum 1.16.0",
+ "typenum 1.16.0 (git+https://github.com/encointer/typenum?tag=v1.16.0)",
 ]
 
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.25",
@@ -10970,7 +11106,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "futures-util",
  "hyper",
@@ -10983,7 +11119,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-trie-migration-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "jsonrpsee",
  "log",
@@ -11004,7 +11140,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "async-trait",
  "futures 0.3.25",
@@ -11030,14 +11166,14 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "ansi_term",
  "build-helper",
  "cargo_metadata",
  "filetime",
  "sp-maybe-compressed-blob",
- "strum 0.23.0",
+ "strum",
  "tempfile",
  "toml",
  "walkdir",
@@ -11052,9 +11188,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "1.0.105"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
+checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -11122,9 +11258,9 @@ dependencies = [
 
 [[package]]
 name = "termcolor"
-version = "1.1.3"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
 dependencies = [
  "winapi-util",
 ]
@@ -11153,8 +11289,8 @@ dependencies = [
 
 [[package]]
 name = "test-runtime-constants"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -11171,18 +11307,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -11284,9 +11420,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.22.0"
+version = "1.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3"
+checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb"
 dependencies = [
  "autocfg",
  "bytes",
@@ -11299,7 +11435,7 @@ dependencies = [
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "winapi",
+ "windows-sys",
 ]
 
 [[package]]
@@ -11352,9 +11488,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.9"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
 dependencies = [
  "serde",
 ]
@@ -11367,9 +11503,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.34"
+version = "0.1.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
  "cfg-if 1.0.0",
  "pin-project-lite 0.2.9",
@@ -11390,11 +11526,11 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.26"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f"
+checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
 dependencies = [
- "lazy_static",
+ "once_cell",
  "valuable",
 ]
 
@@ -11410,8 +11546,8 @@ dependencies = [
 
 [[package]]
 name = "tracing-gum"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-primitives",
@@ -11421,8 +11557,8 @@ dependencies = [
 
 [[package]]
 name = "tracing-gum-proc-macro"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "expander 0.0.6",
  "proc-macro-crate",
@@ -11437,10 +11573,8 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
 dependencies = [
- "ahash",
  "lazy_static",
  "log",
- "lru 0.7.8",
  "tracing-core",
 ]
 
@@ -11479,9 +11613,9 @@ dependencies = [
 
 [[package]]
 name = "trie-db"
-version = "0.23.1"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32d034c0d3db64b43c31de38e945f15b40cd4ca6d2dcfc26d4798ce8de4ab83"
+checksum = "004e1e8f92535694b4cb1444dc5a8073ecf0815e3357f729638b9f8fc4062908"
 dependencies = [
  "hash-db",
  "hashbrown 0.12.3",
@@ -11544,16 +11678,17 @@ dependencies = [
 
 [[package]]
 name = "try-lock"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2"
 dependencies = [
  "clap",
+ "frame-try-runtime",
  "jsonrpsee",
  "log",
  "parity-scale-codec",
@@ -11575,9 +11710,9 @@ dependencies = [
 
 [[package]]
 name = "tt-call"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055"
+checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df"
 
 [[package]]
 name = "twox-hash"
@@ -11593,9 +11728,9 @@ dependencies = [
 
 [[package]]
 name = "typenum"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
 [[package]]
 name = "typenum"
@@ -11635,15 +11770,15 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+checksum = "0046be40136ef78dc325e0edefccf84ccddacd0afcc1ca54103fa3c61bbdab1d"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
 
 [[package]]
 name = "unicode-normalization"
@@ -11654,12 +11789,6 @@ dependencies = [
  "tinyvec",
 ]
 
-[[package]]
-name = "unicode-segmentation"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
-
 [[package]]
 name = "unicode-width"
 version = "0.1.10"
@@ -11899,7 +12028,7 @@ checksum = "ca00c5147c319a8ec91ec1a0edbec31e566ce2c9cc93b3f9bb86a9efd0eb795d"
 dependencies = [
  "downcast-rs",
  "libc",
- "libm",
+ "libm 0.2.6",
  "memory_units",
  "num-rational 0.2.4",
  "num-traits",
@@ -11963,7 +12092,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d1df23c642e1376892f3b72f311596976979cbf8b85469680cdd3a8a063d12a2"
 dependencies = [
  "anyhow",
- "base64",
+ "base64 0.13.1",
  "bincode",
  "directories-next",
  "file-per-thread-logger",
@@ -11988,7 +12117,7 @@ dependencies = [
  "cranelift-frontend",
  "cranelift-native",
  "cranelift-wasm",
- "gimli",
+ "gimli 0.26.2",
  "log",
  "more-asserts",
  "object 0.28.4",
@@ -12006,7 +12135,7 @@ checksum = "839d2820e4b830f4b9e7aa08d4c0acabf4a5036105d639f6dfa1c6891c73bdc6"
 dependencies = [
  "anyhow",
  "cranelift-entity",
- "gimli",
+ "gimli 0.26.2",
  "indexmap",
  "log",
  "more-asserts",
@@ -12024,12 +12153,12 @@ version = "0.38.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef0a0bcbfa18b946d890078ba0e1bc76bcc53eccfb40806c0020ec29dcd1bd49"
 dependencies = [
- "addr2line",
+ "addr2line 0.17.0",
  "anyhow",
  "bincode",
  "cfg-if 1.0.0",
  "cpp_demangle",
- "gimli",
+ "gimli 0.26.2",
  "log",
  "object 0.28.4",
  "region",
@@ -12115,9 +12244,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.22.5"
+version = "0.22.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
 dependencies = [
  "webpki",
 ]
@@ -12133,8 +12262,8 @@ dependencies = [
 
 [[package]]
 name = "westend-runtime"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -12166,6 +12295,7 @@ dependencies = [
  "pallet-multisig",
  "pallet-nomination-pools",
  "pallet-nomination-pools-benchmarking",
+ "pallet-nomination-pools-runtime-api",
  "pallet-offences",
  "pallet-offences-benchmarking",
  "pallet-preimage",
@@ -12221,8 +12351,8 @@ dependencies = [
 
 [[package]]
 name = "westend-runtime-constants"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -12233,9 +12363,9 @@ dependencies = [
 
 [[package]]
 name = "which"
-version = "4.3.0"
+version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"
+checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
 dependencies = [
  "either",
  "libc",
@@ -12292,19 +12422,6 @@ dependencies = [
  "windows_x86_64_msvc 0.34.0",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.42.0"
@@ -12312,19 +12429,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
 dependencies = [
  "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.0",
- "windows_i686_gnu 0.42.0",
- "windows_i686_msvc 0.42.0",
- "windows_x86_64_gnu 0.42.0",
+ "windows_aarch64_msvc 0.42.1",
+ "windows_i686_gnu 0.42.1",
+ "windows_i686_msvc 0.42.1",
+ "windows_x86_64_gnu 0.42.1",
  "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.0",
+ "windows_x86_64_msvc 0.42.1",
 ]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -12334,15 +12451,9 @@ checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
+checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -12352,15 +12463,9 @@ checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.36.1"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
+checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -12370,15 +12475,9 @@ checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
+checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -12388,21 +12487,15 @@ checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
+checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -12412,15 +12505,9 @@ checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
+checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
 
 [[package]]
 name = "winreg"
@@ -12453,8 +12540,8 @@ dependencies = [
 
 [[package]]
 name = "xcm"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "derivative",
  "impl-trait-for-tuples",
@@ -12467,8 +12554,8 @@ dependencies = [
 
 [[package]]
 name = "xcm-builder"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -12488,7 +12575,7 @@ dependencies = [
 [[package]]
 name = "xcm-emulator"
 version = "0.1.0"
-source = "git+https://github.com/shaunxw/xcm-simulator?rev=ab5cd6c5fabe6ddda52ed6803ee1bf54c258fefe#ab5cd6c5fabe6ddda52ed6803ee1bf54c258fefe"
+source = "git+https://github.com/zeitgeistpm/xcm-simulator?branch=moonbeam-polkadot-v0.9.29#4d235aab4d2ab8527aceb8b5849ca4eb18a08a08"
 dependencies = [
  "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
@@ -12504,6 +12591,7 @@ dependencies = [
  "polkadot-primitives",
  "polkadot-runtime-parachains",
  "quote",
+ "sp-arithmetic",
  "sp-io",
  "sp-std",
  "xcm",
@@ -12512,8 +12600,8 @@ dependencies = [
 
 [[package]]
 name = "xcm-executor"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -12530,8 +12618,8 @@ dependencies = [
 
 [[package]]
 name = "xcm-procedural"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.29"
+source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b"
 dependencies = [
  "Inflector",
  "proc-macro2",
@@ -12600,6 +12688,7 @@ dependencies = [
  "sc-finality-grandpa",
  "sc-keystore",
  "sc-network",
+ "sc-network-common",
  "sc-rpc",
  "sc-rpc-api",
  "sc-service",
@@ -12630,7 +12719,6 @@ dependencies = [
  "substrate-build-script-utils",
  "substrate-frame-rpc-system",
  "substrate-prometheus-endpoint",
- "tracing-core",
  "try-runtime-cli",
  "zeitgeist-primitives",
  "zeitgeist-runtime",
@@ -13105,10 +13193,11 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.4+zstd.1.5.2"
+version = "2.0.5+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fa202f2ef00074143e219d15b62ffc317d17cc33909feac471c044087cad7b0"
+checksum = "edc50ffce891ad571e9f9afe5039c4837bede781ac4bb13052ed7ae695518596"
 dependencies = [
  "cc",
  "libc",
+ "pkg-config",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index d23a28b70..d38578d8b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,33 +46,6 @@ members = [
     "zrml/styx",
 ]
 resolver = "2"
-
-[patch."https://github.com/purestake/crowdloan-rewards"]
-# This patch does ensure that crowdloan-rewards only uses partiytech dependencies.
-# If it is not used, the Zeitgeist runtimes will contain duplicate crates from
-# different repositories which results in bigger WASM-blobs, binary and the inability
-# to compile with the "runtime-benchmarks" feature.
-pallet-crowdloan-rewards = { git = "https://github.com/zeitgeistpm/crowdloan-rewards", branch = "polkadot-v0.9.26" }
-
-[patch."https://github.com/purestake/moonbeam"]
-# Use dependencies from Paritytech
-moonbeam-vrf = { git = "https://github.com/zeitgeistpm/moonbeam", branch = "polkadot-v0.9.26" }
-# Fix author-mapping migration
-pallet-author-mapping = { git = "https://github.com/zeitgeistpm/moonbeam", branch = "polkadot-v0.9.26" }
-# Use dependencies from Paritytech
-pallet-parachain-staking = { git = "https://github.com/zeitgeistpm/moonbeam", branch = "polkadot-v0.9.26" }
-session-keys-primitives = { git = "https://github.com/zeitgeistpm/moonbeam", branch = "polkadot-v0.9.26" }
-
-[patch."https://github.com/purestake/nimbus"]
-# Use dependencies from Paritytech
-nimbus-consensus = { git = "https://github.com/zeitgeistpm/nimbus", branch = "polkadot-v0.9.26" }
-# Use dependencies from Paritytech
-nimbus-primitives = { git = "https://github.com/zeitgeistpm/nimbus", branch = "polkadot-v0.9.26" }
-# Use dependencies from Paritytech
-pallet-author-inherent = { git = "https://github.com/zeitgeistpm/nimbus", branch = "polkadot-v0.9.26" }
-# Use dependencies from Paritytech
-pallet-author-slot-filter = { git = "https://github.com/zeitgeistpm/nimbus", branch = "polkadot-v0.9.26" }
-
 # The list of dependencies below (which can be both direct and indirect dependencies) are crates
 # that are suspected to be CPU-intensive, and that are unlikely to require debugging (as some of
 # their debug info might be missing) or to require to be frequently recompiled. We compile these
diff --git a/misc/frame_weight_template.hbs b/misc/frame_weight_template.hbs
index 7c49be588..8efbe31a4 100644
--- a/misc/frame_weight_template.hbs
+++ b/misc/frame_weight_template.hbs
@@ -44,22 +44,22 @@ impl<T: frame_system::Config> {{pallet}}::weights::WeightInfo for WeightInfo<T>
         {{~#each benchmark.components as |c| ~}}
         {{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
     ) -> Weight {
-        ({{underscore benchmark.base_weight}} as Weight)
+        Weight::from_ref_time({{underscore benchmark.base_weight}})
             {{#each benchmark.component_weight as |cw|}}
             // Standard Error: {{underscore cw.error}}
-            .saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
+            .saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into()))
             {{/each}}
             {{#if (ne benchmark.base_reads "0")}}
-            .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
+            .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}))
             {{/if}}
             {{#each benchmark.component_reads as |cr|}}
-            .saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
+            .saturating_add(T::DbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
             {{/each}}
             {{#if (ne benchmark.base_writes "0")}}
-            .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight))
+            .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}))
             {{/if}}
             {{#each benchmark.component_writes as |cw|}}
-            .saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
+            .saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
             {{/each}}
     }
     {{/each}}
diff --git a/misc/orml_weight_template.hbs b/misc/orml_weight_template.hbs
index f77d35c8e..e1e941790 100644
--- a/misc/orml_weight_template.hbs
+++ b/misc/orml_weight_template.hbs
@@ -45,22 +45,22 @@ impl<T: frame_system::Config> {{pallet}}::WeightInfo for WeightInfo<T> {
         {{~#each benchmark.components as |c| ~}}
         {{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
     ) -> Weight {
-        ({{underscore benchmark.base_weight}} as Weight)
+        Weight::from_ref_time({{underscore benchmark.base_weight}})
             {{#each benchmark.component_weight as |cw|}}
             // Standard Error: {{underscore cw.error}}
-            .saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
+            .saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into()))
             {{/each}}
             {{#if (ne benchmark.base_reads "0")}}
-            .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
+            .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}))
             {{/if}}
             {{#each benchmark.component_reads as |cr|}}
-            .saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
+            .saturating_add(T::DbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
             {{/each}}
             {{#if (ne benchmark.base_writes "0")}}
-            .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight))
+            .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}))
             {{/if}}
             {{#each benchmark.component_writes as |cw|}}
-            .saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
+            .saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
             {{/each}}
     }
     {{/each}}
diff --git a/misc/weight_template.hbs b/misc/weight_template.hbs
index 49d63138d..f62c142d8 100644
--- a/misc/weight_template.hbs
+++ b/misc/weight_template.hbs
@@ -57,22 +57,22 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
         {{~#each benchmark.components as |c| ~}}
         {{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
     ) -> Weight {
-        ({{underscore benchmark.base_weight}} as Weight)
+        Weight::from_ref_time({{underscore benchmark.base_weight}})
             {{#each benchmark.component_weight as |cw|}}
             // Standard Error: {{underscore cw.error}}
-            .saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
+            .saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into()))
             {{/each}}
             {{#if (ne benchmark.base_reads "0")}}
-            .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
+            .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}))
             {{/if}}
             {{#each benchmark.component_reads as |cr|}}
-            .saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
+            .saturating_add(T::DbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
             {{/each}}
             {{#if (ne benchmark.base_writes "0")}}
-            .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight))
+            .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}))
             {{/if}}
             {{#each benchmark.component_writes as |cw|}}
-            .saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
+            .saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
             {{/each}}
     }
     {{/each}}
diff --git a/node/Cargo.toml b/node/Cargo.toml
index bf6975d6c..a66b5e24b 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -3,103 +3,102 @@ name = "zeitgeist"
 path = "./src/main.rs"
 
 [build-dependencies]
-substrate-build-script-utils = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
+substrate-build-script-utils = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
 
 [dependencies]
-pallet-transaction-payment = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-pallet-transaction-payment-rpc = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-pallet-transaction-payment-rpc-runtime-api = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-basic-authorship = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-cli = { branch = "polkadot-v0.9.26", features = ["wasmtime"], git = "https://github.com/paritytech/substrate" }
-sc-client-api = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-consensus = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-executor = { branch = "polkadot-v0.9.26", features = ["wasmtime"], git = "https://github.com/paritytech/substrate" }
-sc-keystore = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-rpc = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-rpc-api = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-service = { branch = "polkadot-v0.9.26", features = ["wasmtime"], git = "https://github.com/paritytech/substrate" }
-sc-sysinfo = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-telemetry = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-transaction-pool = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-transaction-pool-api = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-api = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-block-builder = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-blockchain = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-consensus = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-core = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-inherents = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-keyring = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-offchain = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-runtime = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-session = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-storage = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-timestamp = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-transaction-pool = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-trie = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-substrate-frame-rpc-system = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
+pallet-transaction-payment = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+pallet-transaction-payment-rpc = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+pallet-transaction-payment-rpc-runtime-api = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sc-basic-authorship = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sc-cli = { branch = "moonbeam-polkadot-v0.9.29", features = ["wasmtime"], git = "https://github.com/zeitgeistpm/substrate" }
+sc-client-api = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sc-consensus = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sc-executor = { branch = "moonbeam-polkadot-v0.9.29", features = ["wasmtime"], git = "https://github.com/zeitgeistpm/substrate" }
+sc-keystore = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sc-rpc = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sc-rpc-api = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sc-service = { branch = "moonbeam-polkadot-v0.9.29", features = ["wasmtime"], git = "https://github.com/zeitgeistpm/substrate" }
+sc-sysinfo = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sc-telemetry = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sc-transaction-pool = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sc-transaction-pool-api = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-api = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-block-builder = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-blockchain = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-consensus = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-core = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-inherents = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-keyring = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-offchain = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-session = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-storage = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-timestamp = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-transaction-pool = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-trie = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+substrate-frame-rpc-system = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
 
 # Try-Runtime
 
-try-runtime-cli = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
+try-runtime-cli = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
 
 # Benchmark
 
-frame-benchmarking = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
-frame-benchmarking-cli = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
+frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
+frame-benchmarking-cli = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
 
 # Cumulus
 
-cumulus-client-cli = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-client-collator = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-client-consensus-common = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-client-consensus-relay-chain = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-client-network = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-client-service = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-primitives-core = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-primitives-parachain-inherent = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-relay-chain-inprocess-interface = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-relay-chain-interface = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-relay-chain-rpc-interface = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
+cumulus-client-cli = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-client-collator = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-client-consensus-common = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-client-consensus-relay-chain = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-client-network = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-client-service = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-primitives-core = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-primitives-parachain-inherent = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-relay-chain-inprocess-interface = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-relay-chain-interface = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-relay-chain-rpc-interface = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true }
 
 # Parachain
 
-moonbeam-vrf = { tag = "v0.26.1", git = "https://github.com/purestake/moonbeam", optional = true }
-nimbus-consensus = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
-nimbus-primitives = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
-pallet-author-inherent = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
-pallet-parachain-staking = { tag = "v0.26.1", git = "https://github.com/purestake/moonbeam", optional = true }
+moonbeam-vrf = { tag = "v0.27.2-a", git = "https://github.com/zeitgeistpm/moonbeam", optional = true }
+nimbus-consensus = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true }
+nimbus-primitives = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true }
+pallet-author-inherent = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true }
+pallet-parachain-staking = { tag = "v0.27.2-a", git = "https://github.com/zeitgeistpm/moonbeam", optional = true }
 parity-scale-codec = { optional = true, version = "3.0.0" }
-sc-chain-spec = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
-sc-network = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
-sc-tracing = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
-serde = { features = ["derive"], optional = true, version = "1.0.137" }
-session-keys-primitives = { tag = "v0.26.1", default-features = false, git = "https://github.com/purestake/moonbeam", optional = true }
-sp-keystore = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
-substrate-prometheus-endpoint = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
+sc-chain-spec = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
+sc-network = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
+sc-network-common = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
+sc-tracing = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
+serde = { features = ["derive"], optional = true, version = "1.0.144" }
+session-keys-primitives = { tag = "v0.27.2-a", default-features = false, git = "https://github.com/zeitgeistpm/moonbeam", optional = true }
+sp-keystore = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
+substrate-prometheus-endpoint = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
 
 # Polkadot
 
-polkadot-cli = { branch = "release-v0.9.26", git = "https://github.com/paritytech/polkadot", optional = true }
-polkadot-parachain = { branch = "release-v0.9.26", git = "https://github.com/paritytech/polkadot", optional = true }
-polkadot-primitives = { branch = "release-v0.9.26", git = "https://github.com/paritytech/polkadot", optional = true }
-polkadot-service = { branch = "release-v0.9.26", git = "https://github.com/paritytech/polkadot", optional = true }
-polkadot-test-service = { branch = "release-v0.9.26", git = "https://github.com/paritytech/polkadot", optional = true }
+polkadot-cli = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/polkadot", optional = true }
+polkadot-parachain = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/polkadot", optional = true }
+polkadot-primitives = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/polkadot", optional = true }
+polkadot-service = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/polkadot", optional = true }
+polkadot-test-service = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/polkadot", optional = true }
 
 # Standalone
 
-sc-consensus-aura = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-finality-grandpa = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-consensus-aura = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-finality-grandpa = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
+sc-consensus-aura = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sc-finality-grandpa = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-consensus-aura = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-finality-grandpa = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
 
 # Utility
 cfg-if = { version = "1.0.0" }
-clap = { version = "3.2.6", features = ["derive"] }
+clap = { version = "3.2.20", features = ["derive"] }
 hex-literal = { version = "0.3.4" }
-jsonrpsee = { version = "0.14.0", features = ["server"] }
+jsonrpsee = { version = "0.15.1", features = ["server"] }
 log = { optional = true, version = "0.4.17" }
-# TODO(#865): Remove in future Polkadot release
-tracing-core = "=0.1.26"
 
 # Zeitgeist
 
@@ -108,7 +107,6 @@ zeitgeist-primitives = { path = "../primitives" }
 zeitgeist-runtime = { path = "../runtime/zeitgeist", optional = true }
 zrml-liquidity-mining = { path = "../zrml/liquidity-mining" }
 zrml-swaps-rpc = { path = "../zrml/swaps/rpc" }
-
 [features]
 default = ["with-battery-station-runtime", "with-zeitgeist-runtime"]
 parachain = [
@@ -142,6 +140,7 @@ parachain = [
     "session-keys-primitives",
     "sc-chain-spec",
     "sc-network",
+    "sc-network-common",
     "sc-tracing",
     "serde",
     "sp-keystore",
diff --git a/node/src/command_helper.rs b/node/src/benchmarking.rs
similarity index 73%
rename from node/src/command_helper.rs
rename to node/src/benchmarking.rs
index 0253d06dd..9845c461b 100644
--- a/node/src/command_helper.rs
+++ b/node/src/benchmarking.rs
@@ -25,18 +25,18 @@ use sp_inherents::{InherentData, InherentDataProvider};
 use sp_keyring::Sr25519Keyring;
 use sp_runtime::{OpaqueExtrinsic, SaturatedConversion};
 use std::{sync::Arc, time::Duration};
-use zeitgeist_primitives::types::Signature;
+use zeitgeist_primitives::types::{AccountId, Balance, Signature};
 
 /// Generates extrinsics for the `benchmark overhead` command.
 ///
 /// Note: Should only be used for benchmarking.
-pub struct BenchmarkExtrinsicBuilder<RuntimeApi, Executor: NativeExecutionDispatch + 'static> {
+pub struct RemarksExtrinsicBuilder<RuntimeApi, Executor: NativeExecutionDispatch + 'static> {
     client: Arc<FullClient<RuntimeApi, Executor>>,
     is_zeitgeist: bool,
 }
 
 impl<RuntimeApi, Executor: NativeExecutionDispatch + 'static>
-    BenchmarkExtrinsicBuilder<RuntimeApi, Executor>
+    RemarksExtrinsicBuilder<RuntimeApi, Executor>
 {
     /// Creates a new [`Self`] from the given client.
     pub fn new(client: Arc<FullClient<RuntimeApi, Executor>>, is_zeitgeist: bool) -> Self {
@@ -45,9 +45,17 @@ impl<RuntimeApi, Executor: NativeExecutionDispatch + 'static>
 }
 
 impl<RuntimeApi, Executor: NativeExecutionDispatch + 'static>
-    frame_benchmarking_cli::ExtrinsicBuilder for BenchmarkExtrinsicBuilder<RuntimeApi, Executor>
+    frame_benchmarking_cli::ExtrinsicBuilder for RemarksExtrinsicBuilder<RuntimeApi, Executor>
 {
-    fn remark(&self, nonce: u32) -> std::result::Result<OpaqueExtrinsic, &'static str> {
+    fn pallet(&self) -> &str {
+        "system"
+    }
+
+    fn extrinsic(&self) -> &str {
+        "remark"
+    }
+
+    fn build(&self, nonce: u32) -> std::result::Result<OpaqueExtrinsic, &'static str> {
         let acc = Sr25519Keyring::Bob.pair();
 
         #[cfg(feature = "with-zeitgeist-runtime")]
@@ -75,6 +83,76 @@ impl<RuntimeApi, Executor: NativeExecutionDispatch + 'static>
     }
 }
 
+/// Generates `Balances::TransferKeepAlive` extrinsics for the benchmarks.
+///
+/// Note: Should only be used for benchmarking.
+pub struct TransferKeepAliveBuilder<RuntimeApi, Executor: NativeExecutionDispatch + 'static> {
+    client: Arc<FullClient<RuntimeApi, Executor>>,
+    dest: AccountId,
+    value: Balance,
+    is_zeitgeist: bool,
+}
+
+impl<RuntimeApi, Executor: NativeExecutionDispatch + 'static>
+    TransferKeepAliveBuilder<RuntimeApi, Executor>
+{
+    /// Creates a new [`Self`] from the given client.
+    pub fn new(
+        client: Arc<FullClient<RuntimeApi, Executor>>,
+        dest: AccountId,
+        value: Balance,
+        is_zeitgeist: bool,
+    ) -> Self {
+        Self { client, dest, value, is_zeitgeist }
+    }
+}
+
+impl<RuntimeApi, Executor: NativeExecutionDispatch + 'static>
+    frame_benchmarking_cli::ExtrinsicBuilder for TransferKeepAliveBuilder<RuntimeApi, Executor>
+{
+    fn pallet(&self) -> &str {
+        "balances"
+    }
+
+    fn extrinsic(&self) -> &str {
+        "transfer_keep_alive"
+    }
+
+    fn build(&self, nonce: u32) -> std::result::Result<OpaqueExtrinsic, &'static str> {
+        let acc = Sr25519Keyring::Bob.pair();
+        #[cfg(feature = "with-zeitgeist-runtime")]
+        if self.is_zeitgeist {
+            return Ok(create_benchmark_extrinsic_zeitgeist(
+                self.client.as_ref(),
+                acc,
+                zeitgeist_runtime::BalancesCall::transfer_keep_alive {
+                    dest: self.dest.clone().into(),
+                    value: self.value,
+                }
+                .into(),
+                nonce,
+            )
+            .into());
+        }
+        #[cfg(feature = "with-battery-station-runtime")]
+        if !self.is_zeitgeist {
+            return Ok(create_benchmark_extrinsic_battery_station(
+                self.client.as_ref(),
+                acc,
+                battery_station_runtime::BalancesCall::transfer_keep_alive {
+                    dest: self.dest.clone().into(),
+                    value: self.value,
+                }
+                .into(),
+                nonce,
+            )
+            .into());
+        }
+
+        Err(crate::BATTERY_STATION_RUNTIME_NOT_AVAILABLE)
+    }
+}
+
 /// Creates a transaction using the given `call`.
 ///
 /// Note: Should only be used for benchmarking.
diff --git a/node/src/chain_spec/additional_chain_spec.rs b/node/src/chain_spec/additional_chain_spec.rs
index 0498ef136..de4c9e73b 100644
--- a/node/src/chain_spec/additional_chain_spec.rs
+++ b/node/src/chain_spec/additional_chain_spec.rs
@@ -20,15 +20,19 @@ use {
     cumulus_primitives_core::ParaId,
     nimbus_primitives::NimbusId,
     pallet_parachain_staking::InflationInfo,
+    sp_runtime::{Perbill, Percent},
     zeitgeist_primitives::types::{AccountId, Balance},
 };
 
 #[cfg(feature = "parachain")]
 pub struct AdditionalChainSpec {
+    pub blocks_per_round: u32,
     pub candidates: Vec<(AccountId, NimbusId, Balance)>,
+    pub collator_commission: Perbill,
     pub crowdloan_fund_pot: Balance,
     pub inflation_info: InflationInfo<Balance>,
-    pub nominations: Vec<(AccountId, AccountId, Balance)>,
+    pub nominations: Vec<(AccountId, AccountId, Balance, Percent)>,
+    pub parachain_bond_reserve_percent: Percent,
     pub parachain_id: ParaId,
 }
 
diff --git a/node/src/chain_spec/battery_station.rs b/node/src/chain_spec/battery_station.rs
index 7c8835db4..4a56c2df9 100644
--- a/node/src/chain_spec/battery_station.rs
+++ b/node/src/chain_spec/battery_station.rs
@@ -34,7 +34,11 @@ use zeitgeist_primitives::{
 #[cfg(feature = "parachain")]
 use {
     super::{Extensions, DEFAULT_COLLATOR_INFLATION_INFO},
-    battery_station_runtime::{CollatorDeposit, EligibilityValue, PolkadotXcmConfig},
+    crate::BATTERY_STATION_PARACHAIN_ID,
+    battery_station_runtime::{
+        CollatorDeposit, DefaultBlocksPerRound, DefaultCollatorCommission,
+        DefaultParachainBondReservePercent, EligibilityValue, PolkadotXcmConfig,
+    },
 };
 
 cfg_if::cfg_if! {
@@ -56,15 +60,18 @@ fn additional_chain_spec_staging_battery_station(
     parachain_id: cumulus_primitives_core::ParaId,
 ) -> AdditionalChainSpec {
     AdditionalChainSpec {
+        blocks_per_round: DefaultBlocksPerRound::get(),
         candidates: vec![(
             hex!["302f6d7467ae2d7e3b9b962bfc3b9d929da9fae5f1e8c977a031ddf721b0790d"].into(),
             hex!["e6ea0b63b2b5b7247a1e8280350a14c5f9e7745dec2fe3428b68aa4167d48e66"]
                 .unchecked_into(),
             DEFAULT_STAKING_AMOUNT_BATTERY_STATION,
         )],
+        collator_commission: DefaultCollatorCommission::get(),
         crowdloan_fund_pot: DEFAULT_INITIAL_CROWDLOAN_FUNDS_BATTERY_STATION,
         inflation_info: DEFAULT_COLLATOR_INFLATION_INFO,
         nominations: vec![],
+        parachain_bond_reserve_percent: DefaultParachainBondReservePercent::get(),
         parachain_id,
     }
 }
@@ -131,7 +138,7 @@ pub fn battery_station_staging_config() -> Result<BatteryStationChainSpec, Strin
             generic_genesis(
                 additional_chain_spec_staging_battery_station(
                     #[cfg(feature = "parachain")]
-                    crate::BATTERY_STATION_PARACHAIN_ID.into(),
+                    BATTERY_STATION_PARACHAIN_ID.into(),
                 ),
                 endowed_accounts_staging_battery_station(),
                 wasm,
@@ -145,7 +152,7 @@ pub fn battery_station_staging_config() -> Result<BatteryStationChainSpec, Strin
         #[cfg(feature = "parachain")]
         crate::chain_spec::Extensions {
             relay_chain: "rococo".into(),
-            parachain_id: crate::BATTERY_STATION_PARACHAIN_ID,
+            parachain_id: BATTERY_STATION_PARACHAIN_ID,
         },
         #[cfg(not(feature = "parachain"))]
         Default::default(),
diff --git a/node/src/chain_spec/dev.rs b/node/src/chain_spec/dev.rs
index 319b25403..51f461de0 100644
--- a/node/src/chain_spec/dev.rs
+++ b/node/src/chain_spec/dev.rs
@@ -24,7 +24,10 @@ use super::{
 };
 
 #[cfg(feature = "parachain")]
-use battery_station_runtime::{EligibilityValue, PolkadotXcmConfig};
+use battery_station_runtime::{
+    DefaultBlocksPerRound, DefaultCollatorCommission, DefaultParachainBondReservePercent,
+    EligibilityValue, PolkadotXcmConfig,
+};
 use sc_service::ChainType;
 use sp_core::sr25519;
 use zeitgeist_primitives::{
@@ -65,15 +68,18 @@ pub fn dev_config() -> Result<BatteryStationChainSpec, String> {
             generic_genesis(
                 #[cfg(feature = "parachain")]
                 AdditionalChainSpec {
+                    blocks_per_round: DefaultBlocksPerRound::get(),
                     candidates: vec![(
                         get_account_id_from_seed::<sr25519::Public>("Alice"),
                         get_from_seed::<nimbus_primitives::NimbusId>("Alice"),
                         super::battery_station::DEFAULT_STAKING_AMOUNT_BATTERY_STATION,
                     )],
+                    collator_commission: DefaultCollatorCommission::get(),
                     crowdloan_fund_pot: zeitgeist_primitives::constants::BASE.saturating_mul(100),
                     inflation_info: crate::chain_spec::DEFAULT_COLLATOR_INFLATION_INFO,
                     nominations: vec![],
-                    parachain_id: 2050_u32.into(),
+                    parachain_bond_reserve_percent: DefaultParachainBondReservePercent::get(),
+                    parachain_id: crate::BATTERY_STATION_PARACHAIN_ID.into(),
                 },
                 #[cfg(not(feature = "parachain"))]
                 AdditionalChainSpec {
@@ -105,7 +111,10 @@ pub fn dev_config() -> Result<BatteryStationChainSpec, String> {
         None,
         Some(token_properties("DEV", battery_station_runtime::SS58Prefix::get())),
         #[cfg(feature = "parachain")]
-        crate::chain_spec::Extensions { relay_chain: "rococo-dev".into(), parachain_id: 2050_u32 },
+        crate::chain_spec::Extensions {
+            relay_chain: "rococo-dev".into(),
+            parachain_id: crate::BATTERY_STATION_PARACHAIN_ID,
+        },
         #[cfg(not(feature = "parachain"))]
         Default::default(),
     ))
diff --git a/node/src/chain_spec/mod.rs b/node/src/chain_spec/mod.rs
index fa2ebaa97..58340be30 100644
--- a/node/src/chain_spec/mod.rs
+++ b/node/src/chain_spec/mod.rs
@@ -150,14 +150,17 @@ macro_rules! generate_generic_genesis_function {
                 parachain_info: $runtime::ParachainInfoConfig { parachain_id: acs.parachain_id },
                 #[cfg(feature = "parachain")]
                 parachain_staking: $runtime::ParachainStakingConfig {
+                    blocks_per_round: acs.blocks_per_round,
                     candidates: acs
                         .candidates
                         .iter()
                         .cloned()
                         .map(|(account, _, bond)| (account, bond))
                         .collect(),
+                    collator_commission: acs.collator_commission,
                     inflation_config: acs.inflation_info,
                     delegations: acs.nominations,
+                    parachain_bond_reserve_percent: acs.parachain_bond_reserve_percent,
                 },
                 #[cfg(feature = "parachain")]
                 parachain_system: Default::default(),
diff --git a/node/src/chain_spec/zeitgeist.rs b/node/src/chain_spec/zeitgeist.rs
index dfdc7b20d..b5990c7bd 100644
--- a/node/src/chain_spec/zeitgeist.rs
+++ b/node/src/chain_spec/zeitgeist.rs
@@ -29,7 +29,11 @@ use zeitgeist_primitives::constants::ztg::{LIQUIDITY_MINING, LIQUIDITY_MINING_PT
 #[cfg(feature = "parachain")]
 use {
     super::{Extensions, DEFAULT_COLLATOR_INFLATION_INFO},
-    zeitgeist_runtime::{CollatorDeposit, EligibilityValue, MinCollatorStk, PolkadotXcmConfig},
+    crate::KUSAMA_PARACHAIN_ID,
+    zeitgeist_runtime::{
+        CollatorDeposit, DefaultBlocksPerRound, DefaultCollatorCommission,
+        DefaultParachainBondReservePercent, EligibilityValue, MinCollatorStk, PolkadotXcmConfig,
+    },
 };
 
 cfg_if::cfg_if! {
@@ -72,6 +76,7 @@ fn additional_chain_spec_staging_zeitgeist(
     parachain_id: cumulus_primitives_core::ParaId,
 ) -> AdditionalChainSpec {
     AdditionalChainSpec {
+        blocks_per_round: DefaultBlocksPerRound::get(),
         candidates: vec![
             (
                 hex!["524e9aac979cbb9ecdb7acd1635755c3b15696321a3345ca77f0ab0ae23f675a"].into(),
@@ -92,9 +97,11 @@ fn additional_chain_spec_staging_zeitgeist(
                 DEFAULT_STAKING_AMOUNT_ZEITGEIST,
             ),
         ],
+        collator_commission: DefaultCollatorCommission::get(),
         crowdloan_fund_pot: DEFAULT_INITIAL_CROWDLOAN_FUNDS_ZEITGEIST,
         inflation_info: DEFAULT_COLLATOR_INFLATION_INFO,
         nominations: vec![],
+        parachain_bond_reserve_percent: DefaultParachainBondReservePercent::get(),
         parachain_id,
     }
 }
@@ -131,7 +138,7 @@ pub fn zeitgeist_staging_config() -> Result<ZeitgeistChainSpec, String> {
             generic_genesis(
                 additional_chain_spec_staging_zeitgeist(
                     #[cfg(feature = "parachain")]
-                    crate::KUSAMA_PARACHAIN_ID.into(),
+                    KUSAMA_PARACHAIN_ID.into(),
                 ),
                 endowed_accounts_staging_zeitgeist(),
                 wasm,
@@ -145,7 +152,7 @@ pub fn zeitgeist_staging_config() -> Result<ZeitgeistChainSpec, String> {
         #[cfg(feature = "parachain")]
         crate::chain_spec::Extensions {
             relay_chain: "kusama".into(),
-            parachain_id: crate::KUSAMA_PARACHAIN_ID,
+            parachain_id: KUSAMA_PARACHAIN_ID,
         },
         #[cfg(not(feature = "parachain"))]
         Default::default(),
diff --git a/node/src/cli/cli_parachain.rs b/node/src/cli/cli_parachain.rs
index 0e544b9eb..b810a471a 100644
--- a/node/src/cli/cli_parachain.rs
+++ b/node/src/cli/cli_parachain.rs
@@ -60,7 +60,7 @@ impl sc_cli::CliConfiguration<Self> for RelayChainCli {
     }
 
     fn base_path(&self) -> sc_cli::Result<Option<BasePath>> {
-        Ok(self.shared_params().base_path().or_else(|| self.base_path.clone().map(Into::into)))
+        Ok(self.shared_params().base_path()?.or_else(|| self.base_path.clone().map(Into::into)))
     }
 
     fn chain_id(&self, is_dev: bool) -> sc_cli::Result<String> {
@@ -150,12 +150,11 @@ impl sc_cli::CliConfiguration<Self> for RelayChainCli {
         self.base.base.shared_params()
     }
 
-    fn state_cache_child_ratio(&self) -> sc_cli::Result<Option<usize>> {
-        self.base.base.state_cache_child_ratio()
-    }
-
-    fn transaction_pool(&self) -> sc_cli::Result<sc_service::config::TransactionPoolOptions> {
-        self.base.base.transaction_pool()
+    fn transaction_pool(
+        &self,
+        is_dev: bool,
+    ) -> sc_cli::Result<sc_service::config::TransactionPoolOptions> {
+        self.base.base.transaction_pool(is_dev)
     }
 }
 
diff --git a/node/src/command.rs b/node/src/command.rs
index 5c4936a92..57a609a9e 100644
--- a/node/src/command.rs
+++ b/node/src/command.rs
@@ -16,20 +16,25 @@
 // along with Zeitgeist. If not, see <https://www.gnu.org/licenses/>.
 
 use super::{
+    benchmarking::{inherent_benchmark_data, RemarksExtrinsicBuilder, TransferKeepAliveBuilder},
     cli::{Cli, Subcommand},
-    command_helper::{inherent_benchmark_data, BenchmarkExtrinsicBuilder},
     service::{new_chain_ops, new_full, IdentifyVariant},
 };
-use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE};
+use frame_benchmarking_cli::{BenchmarkCmd, ExtrinsicFactory, SUBSTRATE_REFERENCE_HARDWARE};
 use sc_cli::SubstrateCli;
-use std::sync::Arc;
+use sp_keyring::Sr25519Keyring;
 #[cfg(feature = "with-battery-station-runtime")]
 use {
     super::service::BatteryStationExecutor,
-    battery_station_runtime::RuntimeApi as BatteryStationRuntimeApi,
+    battery_station_runtime::{
+        ExistentialDeposit as BatteryStationED, RuntimeApi as BatteryStationRuntimeApi,
+    },
 };
 #[cfg(feature = "with-zeitgeist-runtime")]
-use {super::service::ZeitgeistExecutor, zeitgeist_runtime::RuntimeApi as ZeitgeistRuntimeApi};
+use {
+    super::service::ZeitgeistExecutor,
+    zeitgeist_runtime::{ExistentialDeposit as ZeitgeistED, RuntimeApi as ZeitgeistRuntimeApi},
+};
 #[cfg(feature = "parachain")]
 use {
     sc_client_api::client::BlockBackend,
@@ -151,12 +156,13 @@ pub fn run() -> sc_cli::Result<()> {
                             >(&config)?;
 
                             let ext_builder =
-                                BenchmarkExtrinsicBuilder::new(params.client.clone(), true);
+                                RemarksExtrinsicBuilder::new(params.client.clone(), true);
                             cmd.run(
                                 config,
                                 params.client,
                                 inherent_benchmark_data()?,
-                                Arc::new(ext_builder),
+                                Vec::new(),
+                                &ext_builder,
                             )
                         }),
                         #[cfg(feature = "with-battery-station-runtime")]
@@ -167,12 +173,72 @@ pub fn run() -> sc_cli::Result<()> {
                             >(&config)?;
 
                             let ext_builder =
-                                BenchmarkExtrinsicBuilder::new(params.client.clone(), false);
+                                RemarksExtrinsicBuilder::new(params.client.clone(), false);
                             cmd.run(
                                 config,
                                 params.client,
                                 inherent_benchmark_data()?,
-                                Arc::new(ext_builder),
+                                Vec::new(),
+                                &ext_builder,
+                            )
+                        }),
+                        #[cfg(not(feature = "with-battery-station-runtime"))]
+                        _ => panic!("{}", crate::BATTERY_STATION_RUNTIME_NOT_AVAILABLE),
+                    }
+                }
+
+                BenchmarkCmd::Extrinsic(cmd) => {
+                    if cfg!(feature = "parachain") {
+                        return Err("Extrinsic is only supported in standalone chain".into());
+                    }
+                    match chain_spec {
+                        #[cfg(feature = "with-zeitgeist-runtime")]
+                        spec if spec.is_zeitgeist() => runner.sync_run(|config| {
+                            let params = crate::service::new_partial::<
+                                zeitgeist_runtime::RuntimeApi,
+                                ZeitgeistExecutor,
+                            >(&config)?;
+                            // Register the *Remark* and *TKA* builders.
+                            let ext_factory = ExtrinsicFactory(vec![
+                                Box::new(RemarksExtrinsicBuilder::new(params.client.clone(), true)),
+                                Box::new(TransferKeepAliveBuilder::new(
+                                    params.client.clone(),
+                                    Sr25519Keyring::Alice.to_account_id(),
+                                    ZeitgeistED::get(),
+                                    true,
+                                )),
+                            ]);
+                            cmd.run(
+                                params.client,
+                                inherent_benchmark_data()?,
+                                Vec::new(),
+                                &ext_factory,
+                            )
+                        }),
+                        #[cfg(feature = "with-battery-station-runtime")]
+                        _ => runner.sync_run(|config| {
+                            let params = crate::service::new_partial::<
+                                battery_station_runtime::RuntimeApi,
+                                BatteryStationExecutor,
+                            >(&config)?;
+                            // Register the *Remark* and *TKA* builders.
+                            let ext_factory = ExtrinsicFactory(vec![
+                                Box::new(RemarksExtrinsicBuilder::new(
+                                    params.client.clone(),
+                                    false,
+                                )),
+                                Box::new(TransferKeepAliveBuilder::new(
+                                    params.client.clone(),
+                                    Sr25519Keyring::Alice.to_account_id(),
+                                    BatteryStationED::get(),
+                                    false,
+                                )),
+                            ]);
+                            cmd.run(
+                                params.client,
+                                inherent_benchmark_data()?,
+                                Vec::new(),
+                                &ext_factory,
                             )
                         }),
                         #[cfg(not(feature = "with-battery-station-runtime"))]
@@ -484,10 +550,6 @@ fn none_command(cli: &Cli) -> sc_cli::Result<()> {
 fn none_command(cli: &Cli) -> sc_cli::Result<()> {
     let runner = cli.create_runner(&cli.run)?;
     runner.run_node_until_exit(|config| async move {
-        if let sc_cli::Role::Light = config.role {
-            return Err("Light client not supported!".into());
-        }
-
         match &config.chain_spec {
             #[cfg(feature = "with-zeitgeist-runtime")]
             spec if spec.is_zeitgeist() => new_full::<ZeitgeistRuntimeApi, ZeitgeistExecutor>(
diff --git a/node/src/main.rs b/node/src/main.rs
index 202e66293..45eb875a9 100644
--- a/node/src/main.rs
+++ b/node/src/main.rs
@@ -17,10 +17,10 @@
 
 #![warn(unused_extern_crates)]
 
+mod benchmarking;
 mod chain_spec;
 mod cli;
 mod command;
-mod command_helper;
 mod rpc;
 #[macro_use]
 mod service;
diff --git a/node/src/service.rs b/node/src/service.rs
index f61e46e3e..aa89dfb2e 100644
--- a/node/src/service.rs
+++ b/node/src/service.rs
@@ -132,7 +132,6 @@ cfg_if::cfg_if! {
         /// Additional APIs for parachain runtimes
         pub trait AdditionalRuntimeApiCollection:
             sp_api::ApiExt<Block>
-            + nimbus_primitives::AuthorFilterAPI<Block, nimbus_primitives::NimbusId>
             + nimbus_primitives::NimbusApi<Block>
             + cumulus_primitives_core::CollectCollationInfo<Block>
             + session_keys_primitives::VrfApi<Block>
@@ -144,7 +143,6 @@ cfg_if::cfg_if! {
         impl<Api> AdditionalRuntimeApiCollection for Api
         where
             Api: sp_api::ApiExt<Block>
-                + nimbus_primitives::AuthorFilterAPI<Block, nimbus_primitives::NimbusId>
                 + nimbus_primitives::NimbusApi<Block>
                 + cumulus_primitives_core::CollectCollationInfo<Block>
                 + session_keys_primitives::VrfApi<Block>,
diff --git a/node/src/service/service_parachain.rs b/node/src/service/service_parachain.rs
index 5bf6cbbe3..56f44a993 100644
--- a/node/src/service/service_parachain.rs
+++ b/node/src/service/service_parachain.rs
@@ -32,7 +32,8 @@ use nimbus_consensus::{BuildNimbusConsensusParams, NimbusConsensus};
 use nimbus_primitives::NimbusId;
 use sc_executor::{NativeElseWasmExecutor, NativeExecutionDispatch};
 use sc_network::NetworkService;
-use sc_service::{Configuration, PartialComponents, Role, TFullBackend, TFullClient, TaskManager};
+use sc_network_common::service::NetworkBlock;
+use sc_service::{Configuration, PartialComponents, TFullBackend, TFullClient, TaskManager};
 use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
 use sp_api::ConstructRuntimeApi;
 use sp_keystore::SyncCryptoStorePtr;
@@ -261,10 +262,6 @@ where
         bool,
     ) -> Result<Box<dyn ParachainConsensus<Block>>, sc_service::Error>,
 {
-    if matches!(parachain_config.role, Role::Light) {
-        return Err("Light client not supported!".into());
-    }
-
     let parachain_config = prepare_node_config(parachain_config);
 
     let params = new_partial::<RuntimeApi, Executor>(&parachain_config)?;
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index dc3ad0432..38ffb0fac 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -1,15 +1,15 @@
 [dependencies]
 arbitrary = { default-features = false, optional = true, version = "1.0" }
-frame-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-orml-currencies = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
-orml-tokens = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
-orml-traits = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
+frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+orml-currencies = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
+orml-tokens = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
+orml-traits = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
 parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-serde = { default-features = false, features = ["derive"], optional = true, version = "1.0.137" }
-sp-core = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-runtime = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+serde = { default-features = false, features = ["derive"], optional = true, version = "1.0.144" }
+sp-core = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 
 [dev-dependencies]
 test-case = "2.0.2"
diff --git a/primitives/src/traits/zeitgeist_multi_reservable_currency.rs b/primitives/src/traits/zeitgeist_multi_reservable_currency.rs
index 71697493d..73f5bad68 100644
--- a/primitives/src/traits/zeitgeist_multi_reservable_currency.rs
+++ b/primitives/src/traits/zeitgeist_multi_reservable_currency.rs
@@ -17,10 +17,9 @@
 
 #![allow(clippy::type_complexity)]
 use alloc::vec::Vec;
-use frame_support::traits::Get;
 use orml_tokens::{AccountData, Accounts, TotalIssuance};
 use orml_traits::currency::NamedMultiReservableCurrency;
-use sp_runtime::DispatchError;
+use sp_runtime::{traits::Get, DispatchError};
 
 /// Custom `NamedMultiReservableCurrency` trait.
 pub trait ZeitgeistAssetManager<AccountId>: NamedMultiReservableCurrency<AccountId> {
diff --git a/runtime/battery-station/Cargo.toml b/runtime/battery-station/Cargo.toml
index 9a9f690cf..9c3153d0e 100644
--- a/runtime/battery-station/Cargo.toml
+++ b/runtime/battery-station/Cargo.toml
@@ -1,84 +1,87 @@
 [build-dependencies]
-substrate-wasm-builder = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
+substrate-wasm-builder = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
 
 
 [dependencies]
-frame-executive = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system-rpc-runtime-api = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-orml-benchmarking = { branch = "polkadot-v0.9.26", default-features = false, optional = true, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
-orml-currencies = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
-orml-tokens = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
-orml-traits = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
-pallet-balances = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-bounties = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-collective = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-democracy = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-identity = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-membership = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-multisig = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-preimage = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-proxy = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-randomness-collective-flip = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-scheduler = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-sudo = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-timestamp = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-transaction-payment = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-transaction-payment-rpc-runtime-api = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-treasury = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-utility = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-vesting = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+frame-executive = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+frame-system-rpc-runtime-api = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+orml-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
+orml-currencies = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
+orml-tokens = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
+orml-traits = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
+pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-bounties = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-collective = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-democracy = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-identity = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-membership = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-multisig = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-preimage = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-proxy = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-randomness-collective-flip = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-scheduler = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-sudo = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-transaction-payment = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-transaction-payment-rpc-runtime-api = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-treasury = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-utility = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-vesting = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-sp-api = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-block-builder = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-core = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-inherents = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-offchain = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-runtime = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-session = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-transaction-pool = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-version = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-api = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-block-builder = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-core = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-inherents = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-offchain = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-session = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-transaction-pool = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-version = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 substrate-fixed = { default-features = false, features = ["serde"], git = "https://github.com/encointer/substrate-fixed" }
 
 # Try-Runtime
 
-frame-try-runtime = { branch = "polkadot-v0.9.26", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" }
+frame-try-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/substrate" }
 
 # Benchmark
 
-frame-benchmarking = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate", optional = true }
-frame-system-benchmarking = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate", optional = true }
+frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate", optional = true }
+frame-system-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate", optional = true }
 
 # Cumulus
 
-cumulus-pallet-dmp-queue = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-pallet-parachain-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-pallet-xcm = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-pallet-xcmp-queue = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-primitives-core = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-primitives-timestamp = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-primitives-utility = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-parachain-info = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
+cumulus-pallet-dmp-queue = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-pallet-parachain-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-pallet-xcm = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-pallet-xcmp-queue = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-primitives-core = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-primitives-timestamp = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-primitives-utility = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+parachain-info = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true }
 
 # Parachain
 
-nimbus-primitives = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
-pallet-author-inherent = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
-pallet-author-mapping = { tag = "v0.26.1", default-features = false, git = "https://github.com/purestake/moonbeam", optional = true }
-pallet-author-slot-filter = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
-pallet-crowdloan-rewards = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/crowdloan-rewards", optional = true }
-pallet-parachain-staking = { tag = "v0.26.1", default-features = false, git = "https://github.com/purestake/moonbeam", optional = true }
-polkadot-parachain = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
-session-keys-primitives = { tag = "v0.26.1", default-features = false, git = "https://github.com/purestake/moonbeam", optional = true }
+nimbus-primitives = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true }
+pallet-author-inherent = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true }
+pallet-author-mapping = { tag = "v0.27.2-a", default-features = false, git = "https://github.com/zeitgeistpm/moonbeam", optional = true }
+pallet-author-slot-filter = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true }
+pallet-crowdloan-rewards = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/crowdloan-rewards", optional = true }
+pallet-parachain-staking = { tag = "v0.27.2-a", default-features = false, git = "https://github.com/zeitgeistpm/moonbeam", optional = true }
+session-keys-primitives = { tag = "v0.27.2-a", default-features = false, git = "https://github.com/zeitgeistpm/moonbeam", optional = true }
+
+# Polkadot
+
+polkadot-parachain = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true }
 
 # Standalone
 
-pallet-aura = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-grandpa = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-consensus-aura = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-finality-grandpa = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-aura = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-grandpa = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-consensus-aura = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-finality-grandpa = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 
 # Utility
 cfg-if = { version = "1.0.0" }
@@ -86,17 +89,17 @@ hex-literal = { default-features = false, optional = true, version = "0.3.4" }
 log = { version = "0.4.17", default-features = false, optional = true }
 
 # XCM
-kusama-runtime = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
-orml-asset-registry = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true }
-orml-unknown-tokens = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true }
-orml-xcm-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true }
-orml-xtokens = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true }
-pallet-xcm = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
-polkadot-primitives = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
-polkadot-runtime-parachains = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
-xcm = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
-xcm-builder = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
-xcm-executor = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
+kusama-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true }
+orml-asset-registry = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true }
+orml-unknown-tokens = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true }
+orml-xcm-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true }
+orml-xtokens = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true }
+pallet-xcm = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true }
+polkadot-primitives = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true }
+polkadot-runtime-parachains = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true }
+xcm = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true }
+xcm-builder = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true }
+xcm-executor = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true }
 
 # Zeitgeist
 
@@ -115,8 +118,8 @@ zrml-swaps = { default-features = false, path = "../../zrml/swaps" }
 zrml-swaps-runtime-api = { default-features = false, path = "../../zrml/swaps/runtime-api" }
 
 [dev-dependencies]
-sp-io = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-xcm-emulator = { rev = "ab5cd6c5fabe6ddda52ed6803ee1bf54c258fefe", git = "https://github.com/shaunxw/xcm-simulator" }
+sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+xcm-emulator = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/xcm-simulator" }
 
 [features]
 default = ["std"]
@@ -330,6 +333,7 @@ try-runtime = [
 
     # System runtime pallets
     "frame-system/try-runtime",
+    "frame-support/try-runtime",
     "pallet-timestamp/try-runtime",
     "pallet-randomness-collective-flip/try-runtime",
     "pallet-scheduler/try-runtime",
@@ -373,10 +377,24 @@ try-runtime = [
 
     # Parachain
     "pallet-author-mapping?/try-runtime",
+    "pallet-author-inherent?/try-runtime",
     "pallet-author-slot-filter?/try-runtime",
     "pallet-parachain-staking?/try-runtime",
     # Required by pallet-parachain-staking@v0.26.1
     "parity-scale-codec/full",
+    "pallet-proxy/try-runtime",
+    "pallet-grandpa/try-runtime",
+    "pallet-aura/try-runtime",
+    "pallet-sudo/try-runtime",
+    "pallet-xcm?/try-runtime",
+    "pallet-crowdloan-rewards?/try-runtime",
+
+    # Cumulus
+    "cumulus-pallet-parachain-system?/try-runtime",
+    "cumulus-pallet-xcm?/try-runtime",
+    "cumulus-pallet-dmp-queue?/try-runtime",
+    "cumulus-pallet-xcmp-queue?/try-runtime",
+    "parachain-info?/try-runtime",
 ]
 with-global-disputes = [
     "zrml-global-disputes",
diff --git a/runtime/battery-station/src/integration_tests/xcm/test_net.rs b/runtime/battery-station/src/integration_tests/xcm/test_net.rs
index 8d6d8351d..de2b6acac 100644
--- a/runtime/battery-station/src/integration_tests/xcm/test_net.rs
+++ b/runtime/battery-station/src/integration_tests/xcm/test_net.rs
@@ -123,7 +123,7 @@ fn default_parachains_host_configuration() -> HostConfiguration<BlockNumber> {
         max_upward_queue_count: 8,
         max_upward_queue_size: 1024 * 1024,
         max_downward_message_size: 1024,
-        ump_service_total_weight: Weight::from(4 * 1_000_000_000u32),
+        ump_service_total_weight: Weight::from_ref_time(4_u64 * 1_000_000_000_u64),
         max_upward_message_size: 50 * 1024,
         max_upward_message_num_per_candidate: 5,
         hrmp_sender_deposit: 0,
diff --git a/runtime/battery-station/src/lib.rs b/runtime/battery-station/src/lib.rs
index bac3d5b61..f117fc81b 100644
--- a/runtime/battery-station/src/lib.rs
+++ b/runtime/battery-station/src/lib.rs
@@ -33,6 +33,7 @@ pub use frame_system::{
 };
 #[cfg(feature = "parachain")]
 pub use pallet_author_slot_filter::EligibilityValue;
+pub use pallet_balances::Call as BalancesCall;
 
 #[cfg(feature = "parachain")]
 pub use crate::parachain_params::*;
@@ -74,7 +75,7 @@ use sp_runtime::{
 };
 
 #[cfg(feature = "parachain")]
-use nimbus_primitives::{CanAuthor, NimbusId};
+use nimbus_primitives::CanAuthor;
 use sp_version::RuntimeVersion;
 
 #[cfg(feature = "parachain")]
diff --git a/runtime/battery-station/src/parachain_params.rs b/runtime/battery-station/src/parachain_params.rs
index 1d5092151..6f9546de1 100644
--- a/runtime/battery-station/src/parachain_params.rs
+++ b/runtime/battery-station/src/parachain_params.rs
@@ -49,10 +49,10 @@ parameter_types! {
     pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();
     pub const RelayLocation: MultiLocation = MultiLocation::parent();
     pub const RelayNetwork: NetworkId = NetworkId::Any;
-    pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;
-    pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;
+    pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
+    pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
     pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();
-    pub UnitWeightCost: Weight = 200_000_000;
+    pub UnitWeightCost: u64 = 200_000_000;
 
     // Staking
     /// Rounds before the candidate bond increase/decrease can be executed
@@ -90,7 +90,7 @@ parameter_types! {
 
     // XCM
     /// Base weight for XCM execution
-    pub const BaseXcmWeight: Weight = 200_000_000;
+    pub const BaseXcmWeight: u64 = 200_000_000;
     /// The maximum number of distinct assets allowed to be transferred in a
     /// single helper extrinsic.
     pub const MaxAssetsForTransfer: usize = 2;
diff --git a/runtime/battery-station/src/parameters.rs b/runtime/battery-station/src/parameters.rs
index 2fa08b893..2e8547296 100644
--- a/runtime/battery-station/src/parameters.rs
+++ b/runtime/battery-station/src/parameters.rs
@@ -34,7 +34,8 @@ use frame_system::limits::{BlockLength, BlockWeights};
 use orml_traits::parameter_type_with_key;
 use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment};
 use sp_runtime::{
-    traits::AccountIdConversion, FixedPointNumber, Perbill, Percent, Permill, Perquintill,
+    traits::{AccountIdConversion, Bounded},
+    FixedPointNumber, Perbill, Percent, Permill, Perquintill,
 };
 use sp_version::RuntimeVersion;
 use zeitgeist_primitives::{constants::*, types::*};
@@ -43,7 +44,8 @@ use zeitgeist_primitives::{constants::*, types::*};
 use frame_support::traits::LockIdentifier;
 
 pub(crate) const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);
-pub(crate) const MAXIMUM_BLOCK_WEIGHT: Weight = WEIGHT_PER_SECOND / 2;
+pub(crate) const MAXIMUM_BLOCK_WEIGHT: Weight =
+    Weight::from_ref_time(WEIGHT_PER_SECOND.ref_time() / 2);
 pub(crate) const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
 pub(crate) const FEES_AND_TIPS_TREASURY_PERCENTAGE: u32 = 100;
 pub(crate) const FEES_AND_TIPS_BURN_PERCENTAGE: u32 = 0;
@@ -273,9 +275,6 @@ parameter_types! {
     .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)
     .build_or_panic();
 
-    // Timestamp
-    pub const MinimumPeriod: u64 = MILLISECS_PER_BLOCK as u64 / 2;
-
     // Transaction payment
     /// A fee mulitplier for Operational extrinsics to compute “virtual tip”
     /// to boost their priority.
@@ -292,6 +291,8 @@ parameter_types! {
     /// Minimum amount of the multiplier. The test `multiplier_can_grow_from_zero` ensures
     /// that this value is not too low.
     pub MinimumMultiplier: Multiplier = Multiplier::saturating_from_rational(1, 1_000_000u128);
+    /// Maximum amount of the multiplier.
+    pub MaximumMultiplier: Multiplier = Bounded::max_value();
 
     // Treasury
     /// Percentage of spare funds (if any) that are burnt per spend period.
@@ -312,6 +313,10 @@ parameter_types! {
     /// Treasury account.
     pub ZeitgeistTreasuryAccount: AccountId = TreasuryPalletId::get().into_account_truncating();
 
+    // Timestamp
+    /// MinimumPeriod for Timestamp
+    pub const MinimumPeriodValue: u64 = MILLISECS_PER_BLOCK as u64 / 2;
+
     // Bounties
     /// The amount held on deposit for placing a bounty proposal.
     pub const BountyDepositBase: Balance = 100 * BASE;
@@ -378,5 +383,10 @@ parameter_type_with_key! {
 
 // Parameterized slow adjusting fee updated based on
 // https://research.web3.foundation/en/latest/polkadot/overview/2-token-economics.html#-2.-slow-adjusting-mechanism
-pub type SlowAdjustingFeeUpdate<R> =
-    TargetedFeeAdjustment<R, TargetBlockFullness, AdjustmentVariable, MinimumMultiplier>;
+pub type SlowAdjustingFeeUpdate<R> = TargetedFeeAdjustment<
+    R,
+    TargetBlockFullness,
+    AdjustmentVariable,
+    MinimumMultiplier,
+    MaximumMultiplier,
+>;
diff --git a/runtime/battery-station/src/xcm_config/config.rs b/runtime/battery-station/src/xcm_config/config.rs
index 4e09b741c..238537fe9 100644
--- a/runtime/battery-station/src/xcm_config/config.rs
+++ b/runtime/battery-station/src/xcm_config/config.rs
@@ -71,6 +71,7 @@ impl Config for XcmConfig {
     type Barrier = Barrier;
     /// The outer call dispatch type.
     type Call = Call;
+    type CallDispatcher = Call;
     /// Combinations of (Location, Asset) pairs which are trusted as reserves.
     // Trust the parent chain, sibling parachains and children chains of this chain.
     type IsReserve = MultiNativeAsset<AbsoluteReserveProvider>;
diff --git a/runtime/battery-station/src/xcm_config/fees.rs b/runtime/battery-station/src/xcm_config/fees.rs
index dbedf3d93..bc188eafc 100644
--- a/runtime/battery-station/src/xcm_config/fees.rs
+++ b/runtime/battery-station/src/xcm_config/fees.rs
@@ -29,8 +29,8 @@ pub fn native_per_second() -> Balance {
 }
 
 pub fn default_per_second(decimals: u32) -> Balance {
-    let base_weight = Balance::from(ExtrinsicBaseWeight::get());
-    let default_per_second = (WEIGHT_PER_SECOND as u128) / base_weight;
+    let base_weight = ExtrinsicBaseWeight::get().ref_time() as u128;
+    let default_per_second = (WEIGHT_PER_SECOND.ref_time() as u128) / base_weight;
     default_per_second * base_fee(decimals)
 }
 
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
index d72cdb3c4..fae491e83 100644
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -1,31 +1,31 @@
 [dependencies]
 # Pallets
-cumulus-pallet-xcmp-queue = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-frame-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-orml-currencies = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
-orml-tokens = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
-pallet-author-inherent = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
-pallet-author-mapping = { tag = "v0.26.1", default-features = false, git = "https://github.com/purestake/moonbeam", optional = true }
-pallet-author-slot-filter = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
-pallet-balances = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-bounties = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-collective = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-democracy = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-identity = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-membership = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-multisig = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-parachain-staking = { tag = "v0.26.1", default-features = false, git = "https://github.com/purestake/moonbeam", optional = true }
-pallet-preimage = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-proxy = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-randomness-collective-flip = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-scheduler = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-timestamp = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-transaction-payment = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-transaction-payment-rpc-runtime-api = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-treasury = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-utility = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-vesting = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+cumulus-pallet-xcmp-queue = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+orml-currencies = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
+orml-tokens = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
+pallet-author-inherent = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true }
+pallet-author-mapping = { tag = "v0.27.2-a", default-features = false, git = "https://github.com/zeitgeistpm/moonbeam", optional = true }
+pallet-author-slot-filter = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true }
+pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-bounties = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-collective = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-democracy = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-identity = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-membership = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-multisig = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-parachain-staking = { tag = "v0.27.2-a", default-features = false, git = "https://github.com/zeitgeistpm/moonbeam", optional = true }
+pallet-preimage = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-proxy = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-randomness-collective-flip = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-scheduler = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-transaction-payment = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-transaction-payment-rpc-runtime-api = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-treasury = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-utility = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-vesting = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 
 # Utility
 cfg-if = { version = "1.0.0" }
diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
index e7e27882f..8d53dde59 100644
--- a/runtime/common/src/lib.rs
+++ b/runtime/common/src/lib.rs
@@ -45,7 +45,7 @@ pub mod weights;
 macro_rules! decl_common_types {
     {} => {
         use sp_runtime::generic;
-        use frame_support::traits::{Currency, Imbalance, OnUnbalanced, NeverEnsureOrigin};
+        use frame_support::traits::{Currency, Imbalance, OnUnbalanced, NeverEnsureOrigin, TryStateSelect};
 
         pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 
@@ -59,6 +59,7 @@ macro_rules! decl_common_types {
             Runtime,
             AllPalletsWithSystem,
             (
+                pallet_parachain_staking::migrations::MigrateAtStakeAutoCompound<Runtime>,
                 zrml_prediction_markets::migrations::UpdateMarketsForBaseAssetAndRecordBonds<Runtime>,
                 zrml_prediction_markets::migrations::AddFieldToAuthorityReport<Runtime>,
             ),
@@ -516,9 +517,6 @@ macro_rules! impl_config_traits {
             type BlockAuthor = AuthorInherent;
             type CandidateBondLessDelay = CandidateBondLessDelay;
             type Currency = Balances;
-            type DefaultBlocksPerRound = DefaultBlocksPerRound;
-            type DefaultCollatorCommission = DefaultCollatorCommission;
-            type DefaultParachainBondReservePercent = DefaultParachainBondReservePercent;
             type DelegationBondLessDelay = DelegationBondLessDelay;
             type Event = Event;
             type LeaveCandidatesDelay = LeaveCandidatesDelay;
@@ -625,7 +623,7 @@ macro_rules! impl_config_traits {
             type MaxLocks = MaxLocks;
             type MaxReserves = MaxReserves;
             type ReserveIdentifier = [u8; 8];
-            type WeightInfo = pallet_balances::weights::SubstrateWeight<Runtime>; // weights::pallet_balances::WeightInfo<Runtime>;
+            type WeightInfo = weights::pallet_balances::WeightInfo<Runtime>;
         }
 
         impl pallet_collective::Config<AdvisoryCommitteeInstance> for Runtime {
@@ -841,6 +839,38 @@ macro_rules! impl_config_traits {
             type NoPreimagePostponement = NoPreimagePostponement;
         }
 
+        // Timestamp
+        /// Custom getter for minimum timestamp delta.
+        /// This ensures that consensus systems like Aura don't break assertions
+        /// in a benchmark environment
+        pub struct MinimumPeriod;
+        impl MinimumPeriod {
+            /// Returns the value of this parameter type.
+            pub fn get() -> u64 {
+                #[cfg(feature = "runtime-benchmarks")]
+                {
+                    use frame_benchmarking::benchmarking::get_whitelist;
+                    // Should that condition be true, we can assume that we are in a benchmark environment.
+                    if !get_whitelist().is_empty() {
+                        return u64::MAX;
+                    }
+                }
+
+                MinimumPeriodValue::get()
+            }
+        }
+        impl<I: From<u64>> frame_support::traits::Get<I> for MinimumPeriod {
+            fn get() -> I {
+                I::from(Self::get())
+            }
+        }
+        impl frame_support::traits::TypedGet for MinimumPeriod {
+            type Type = u64;
+            fn get() -> u64 {
+                Self::get()
+            }
+        }
+
         impl pallet_timestamp::Config for Runtime {
             type MinimumPeriod = MinimumPeriod;
             type Moment = u64;
@@ -907,7 +937,7 @@ macro_rules! impl_config_traits {
             type Currency = Balances;
             type BlockNumberToBalance = sp_runtime::traits::ConvertInto;
             type MinVestedTransfer = MinVestedTransfer;
-            type WeightInfo = pallet_vesting::weights::SubstrateWeight<Runtime>; // weights::pallet_vesting::WeightInfo<Runtime>;
+            type WeightInfo = weights::pallet_vesting::WeightInfo<Runtime>;
 
             // `VestingInfo` encode length is 36bytes. 28 schedules gets encoded as 1009 bytes, which is the
             // highest number of schedules that encodes less than 2^10.
@@ -1115,14 +1145,6 @@ macro_rules! create_runtime_api {
                 }
             }
 
-            #[cfg(feature = "parachain")]
-            // Required to satisify trait bounds at the client implementation.
-            impl nimbus_primitives::AuthorFilterAPI<Block, NimbusId> for Runtime {
-                fn can_author(_: NimbusId, _: u32, _: &<Block as BlockT>::Header) -> bool {
-                    panic!("AuthorFilterAPI is no longer supported. Please update your client.")
-                }
-            }
-
             #[cfg(feature = "parachain")]
             impl nimbus_primitives::NimbusApi<Block> for Runtime {
                 fn can_author(
@@ -1209,6 +1231,7 @@ macro_rules! create_runtime_api {
                     list_benchmark!(list, extra, zrml_court, Court);
                     #[cfg(feature = "with-global-disputes")]
                     list_benchmark!(list, extra, zrml_global_disputes, GlobalDisputes);
+                    #[cfg(not(feature = "parachain"))]
                     list_benchmark!(list, extra, zrml_prediction_markets, PredictionMarkets);
                     list_benchmark!(list, extra, zrml_liquidity_mining, LiquidityMining);
                     list_benchmark!(list, extra, zrml_styx, Styx);
@@ -1287,6 +1310,7 @@ macro_rules! create_runtime_api {
                     add_benchmark!(params, batches, zrml_court, Court);
                     #[cfg(feature = "with-global-disputes")]
                     add_benchmark!(params, batches, zrml_global_disputes, GlobalDisputes);
+                    #[cfg(not(feature = "parachain"))]
                     add_benchmark!(params, batches, zrml_prediction_markets, PredictionMarkets);
                     add_benchmark!(params, batches, zrml_liquidity_mining, LiquidityMining);
                     add_benchmark!(params, batches, zrml_styx, Styx);
@@ -1335,6 +1359,23 @@ macro_rules! create_runtime_api {
                 }
             }
 
+            impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi<Block, Balance, Call>
+            for Runtime
+            {
+                fn query_call_info(
+                    call: Call,
+                    len: u32,
+                ) -> pallet_transaction_payment::RuntimeDispatchInfo<Balance> {
+                    TransactionPayment::query_call_info(call, len)
+                }
+                fn query_call_fee_details(
+                    call: Call,
+                    len: u32,
+                ) -> pallet_transaction_payment::FeeDetails<Balance> {
+                    TransactionPayment::query_call_fee_details(call, len)
+                }
+            }
+
             #[cfg(feature = "parachain")]
             impl session_keys_primitives::VrfApi<Block> for Runtime {
                 fn get_last_vrf_output() -> Option<<Block as BlockT>::Hash> {
@@ -1489,8 +1530,17 @@ macro_rules! create_runtime_api {
                     (weight, RuntimeBlockWeights::get().max_block)
                 }
 
-                fn execute_block_no_check(block: Block) -> frame_support::weights::Weight {
-                    Executive::execute_block_no_check(block)
+                fn execute_block(block: Block, state_root_check: bool, try_state: frame_try_runtime::TryStateSelect) -> frame_support::weights::Weight {
+                    log::info!(
+                        "try-runtime: executing block #{} {:?} / root checks: {:?} / try-state-select: {:?}",
+                        block.header.number,
+                        block.header.hash(),
+                        state_root_check,
+                        try_state,
+                    );
+                    // NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to
+                    // have a backtrace here.
+                    Executive::try_execute_block(block, state_root_check, try_state).expect("execute-block failed")
                 }
             }
 
@@ -1810,7 +1860,7 @@ macro_rules! create_common_tests {
                     pub BlockLength: frame_system::limits::BlockLength =
                         frame_system::limits::BlockLength::max(2 * 1024);
                     pub BlockWeights: frame_system::limits::BlockWeights =
-                        frame_system::limits::BlockWeights::simple_max(1024);
+                        frame_system::limits::BlockWeights::simple_max(Weight::from_ref_time(1024));
                 }
 
                 impl frame_system::Config for Runtime {
diff --git a/runtime/common/src/weights/cumulus_pallet_xcmp_queue.rs b/runtime/common/src/weights/cumulus_pallet_xcmp_queue.rs
index 1ac2e70c4..5af541910 100644
--- a/runtime/common/src/weights/cumulus_pallet_xcmp_queue.rs
+++ b/runtime/common/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for cumulus_pallet_xcmp_queue
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -50,14 +50,14 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::weights::WeightInfo for WeightInfo<T> {
     // Storage: XcmpQueue QueueConfig (r:1 w:1)
     fn set_config_with_u32() -> Weight {
-        (12_060_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(4_785_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: XcmpQueue QueueConfig (r:1 w:1)
     fn set_config_with_weight() -> Weight {
-        (11_590_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(4_691_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
 }
diff --git a/runtime/common/src/weights/frame_system.rs b/runtime/common/src/weights/frame_system.rs
index 718ed212f..d8558bb8c 100644
--- a/runtime/common/src/weights/frame_system.rs
+++ b/runtime/common/src/weights/frame_system.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for frame_system
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -48,42 +48,40 @@ use frame_support::{
 /// Weight functions for frame_system (automatically generated)
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> frame_system::weights::WeightInfo for WeightInfo<T> {
-    fn remark(b: u32) -> Weight {
-        (0 as Weight)
-            // Standard Error: 0
-            .saturating_add((1_000 as Weight).saturating_mul(b as Weight))
+    fn remark(_b: u32) -> Weight {
+        Weight::from_ref_time(6_388_000)
     }
     fn remark_with_event(b: u32) -> Weight {
-        (0 as Weight)
+        Weight::from_ref_time(0)
             // Standard Error: 0
-            .saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+            .saturating_add(Weight::from_ref_time(1_000).saturating_mul(b.into()))
     }
     // Storage: System Digest (r:1 w:1)
     // Storage: unknown [0x3a686561707061676573] (r:0 w:1)
     fn set_heap_pages() -> Weight {
-        (11_750_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(5_605_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Skipped Metadata (r:0 w:0)
     fn set_storage(i: u32) -> Weight {
-        (0 as Weight)
-            // Standard Error: 9_000
-            .saturating_add((1_266_000 as Weight).saturating_mul(i as Weight))
-            .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
+        Weight::from_ref_time(417_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(411_000).saturating_mul(i.into()))
+            .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
     }
     // Storage: Skipped Metadata (r:0 w:0)
     fn kill_storage(i: u32) -> Weight {
-        (0 as Weight)
-            // Standard Error: 3_000
-            .saturating_add((1_021_000 as Weight).saturating_mul(i as Weight))
-            .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
+        Weight::from_ref_time(0)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(369_000).saturating_mul(i.into()))
+            .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
     }
     // Storage: Skipped Metadata (r:0 w:0)
     fn kill_prefix(p: u32) -> Weight {
-        (0 as Weight)
-            // Standard Error: 11_000
-            .saturating_add((2_239_000 as Weight).saturating_mul(p as Weight))
-            .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
+        Weight::from_ref_time(3_542_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(792_000).saturating_mul(p.into()))
+            .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
     }
 }
diff --git a/runtime/common/src/weights/orml_currencies.rs b/runtime/common/src/weights/orml_currencies.rs
index 92116c82d..dfcaa524a 100644
--- a/runtime/common/src/weights/orml_currencies.rs
+++ b/runtime/common/src/weights/orml_currencies.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for orml_currencies
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -45,42 +45,37 @@ use frame_support::{traits::Get, weights::Weight};
 /// Weight functions for orml_currencies (automatically generated)
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> orml_currencies::WeightInfo for WeightInfo<T> {
-    // Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
     // Storage: Tokens Accounts (r:2 w:2)
     // Storage: System Account (r:1 w:1)
     fn transfer_non_native_currency() -> Weight {
-        (67_910_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(4 as Weight))
+        Weight::from_ref_time(28_582_000)
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
-    // Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn transfer_native_currency() -> Weight {
-        (65_590_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(26_474_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
-    // Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
     // Storage: Tokens Accounts (r:1 w:1)
     // Storage: Tokens TotalIssuance (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn update_balance_non_native_currency() -> Weight {
-        (54_870_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(4 as Weight))
+        Weight::from_ref_time(21_690_000)
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
-    // Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn update_balance_native_currency_creating() -> Weight {
-        (52_580_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(21_531_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
-    // Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn update_balance_native_currency_killing() -> Weight {
-        (51_960_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(19_409_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
 }
diff --git a/runtime/common/src/weights/orml_tokens.rs b/runtime/common/src/weights/orml_tokens.rs
index 42a7200ad..81b1bcb2c 100644
--- a/runtime/common/src/weights/orml_tokens.rs
+++ b/runtime/common/src/weights/orml_tokens.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for orml_tokens
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -45,45 +45,40 @@ use frame_support::{traits::Get, weights::Weight};
 /// Weight functions for orml_tokens (automatically generated)
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> orml_tokens::WeightInfo for WeightInfo<T> {
-    // Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
     // Storage: Tokens Accounts (r:2 w:2)
     // Storage: System Account (r:1 w:1)
     fn transfer() -> Weight {
-        (67_361_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(4 as Weight))
+        Weight::from_ref_time(28_003_000)
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
-    // Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
     // Storage: Tokens Accounts (r:2 w:2)
     // Storage: System Account (r:1 w:1)
     fn transfer_all() -> Weight {
-        (79_580_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(4 as Weight))
+        Weight::from_ref_time(30_502_000)
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
-    // Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
     // Storage: Tokens Accounts (r:2 w:2)
     // Storage: System Account (r:1 w:1)
     fn transfer_keep_alive() -> Weight {
-        (68_240_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(4 as Weight))
+        Weight::from_ref_time(25_994_000)
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
-    // Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
     // Storage: Tokens Accounts (r:2 w:2)
     // Storage: System Account (r:2 w:1)
     fn force_transfer() -> Weight {
-        (74_910_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(5 as Weight))
-            .saturating_add(T::DbWeight::get().writes(4 as Weight))
+        Weight::from_ref_time(29_043_000)
+            .saturating_add(T::DbWeight::get().reads(4))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
-    // Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
     // Storage: Tokens Accounts (r:1 w:1)
     // Storage: Tokens TotalIssuance (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn set_balance() -> Weight {
-        (58_480_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(4 as Weight))
+        Weight::from_ref_time(21_069_000)
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
 }
diff --git a/runtime/common/src/weights/pallet_author_inherent.rs b/runtime/common/src/weights/pallet_author_inherent.rs
index 47b4209c1..d42c1cd4b 100644
--- a/runtime/common/src/weights/pallet_author_inherent.rs
+++ b/runtime/common/src/weights/pallet_author_inherent.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_author_inherent
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-09-29, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-01-05, STEPS: `10`, REPEAT: 10, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -26,8 +26,8 @@
 // benchmark
 // pallet
 // --chain=dev
-// --steps=50
-// --repeat=20
+// --steps=10
+// --repeat=10
 // --pallet=pallet_author_inherent
 // --extrinsic=*
 // --execution=wasm
@@ -45,7 +45,7 @@ use frame_support::{
     weights::{constants::RocksDbWeight, Weight},
 };
 
-/// Weight functions for pallet_author_mapping (automatically generated)
+/// Weight functions for pallet_author_inherent (automatically generated)
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_author_inherent::weights::WeightInfo for WeightInfo<T> {
     // Storage: ParachainSystem ValidationData (r:1 w:0)
@@ -54,10 +54,9 @@ impl<T: frame_system::Config> pallet_author_inherent::weights::WeightInfo for We
     // Storage: ParachainStaking SelectedCandidates (r:1 w:0)
     // Storage: AuthorFilter EligibleCount (r:1 w:0)
     // Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
-    #[rustfmt::skip]
     fn kick_off_authorship_validation() -> Weight {
-        (20_862_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(6 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(28_113_000)
+            .saturating_add(T::DbWeight::get().reads(6))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
 }
diff --git a/runtime/common/src/weights/pallet_author_mapping.rs b/runtime/common/src/weights/pallet_author_mapping.rs
index 03196fb0f..b3a3f76ec 100644
--- a/runtime/common/src/weights/pallet_author_mapping.rs
+++ b/runtime/common/src/weights/pallet_author_mapping.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_author_mapping
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -52,38 +52,38 @@ impl<T: frame_system::Config> pallet_author_mapping::weights::WeightInfo for Wei
     // Storage: System Account (r:1 w:1)
     // Storage: AuthorMapping NimbusLookup (r:0 w:1)
     fn add_association() -> Weight {
-        (51_350_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(22_310_000)
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: AuthorMapping MappingWithDeposit (r:2 w:2)
     // Storage: AuthorMapping NimbusLookup (r:0 w:1)
     fn update_association() -> Weight {
-        (43_640_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(18_658_000)
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: AuthorMapping MappingWithDeposit (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     // Storage: AuthorMapping NimbusLookup (r:0 w:1)
     fn clear_association() -> Weight {
-        (53_600_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(25_042_000)
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: AuthorMapping NimbusLookup (r:1 w:1)
     // Storage: AuthorMapping MappingWithDeposit (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn remove_keys() -> Weight {
-        (59_700_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(27_303_000)
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: AuthorMapping NimbusLookup (r:1 w:1)
     // Storage: AuthorMapping MappingWithDeposit (r:2 w:2)
     fn set_keys() -> Weight {
-        (49_860_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(21_261_000)
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
 }
diff --git a/runtime/common/src/weights/pallet_author_slot_filter.rs b/runtime/common/src/weights/pallet_author_slot_filter.rs
index 1c4af1ee3..43c1640b8 100644
--- a/runtime/common/src/weights/pallet_author_slot_filter.rs
+++ b/runtime/common/src/weights/pallet_author_slot_filter.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_author_slot_filter
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -50,6 +50,6 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_author_slot_filter::weights::WeightInfo for WeightInfo<T> {
     // Storage: AuthorFilter EligibleCount (r:0 w:1)
     fn set_eligible() -> Weight {
-        (25_110_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(9_138_000).saturating_add(T::DbWeight::get().writes(1))
     }
 }
diff --git a/runtime/common/src/weights/pallet_balances.rs b/runtime/common/src/weights/pallet_balances.rs
index 2db9ec484..206995a80 100644
--- a/runtime/common/src/weights/pallet_balances.rs
+++ b/runtime/common/src/weights/pallet_balances.rs
@@ -18,16 +18,16 @@
 //! Autogenerated weights for pallet_balances
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-01-05, STEPS: `2`, REPEAT: 2, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/zeitgeist
+// ./target/release/zeitgeist
 // benchmark
 // pallet
 // --chain=dev
-// --steps=50
-// --repeat=20
+// --steps=2
+// --repeat=2
 // --pallet=pallet_balances
 // --extrinsic=*
 // --execution=wasm
@@ -50,44 +50,44 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_balances::weights::WeightInfo for WeightInfo<T> {
     // Storage: System Account (r:1 w:1)
     fn transfer() -> Weight {
-        (73_560_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(64_342_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: System Account (r:1 w:1)
     fn transfer_keep_alive() -> Weight {
-        (56_010_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(48_802_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: System Account (r:1 w:1)
     fn set_balance_creating() -> Weight {
-        (37_611_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(35_618_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: System Account (r:1 w:1)
     fn set_balance_killing() -> Weight {
-        (42_260_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(38_954_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: System Account (r:2 w:2)
     fn force_transfer() -> Weight {
-        (74_041_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(61_868_000)
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: System Account (r:1 w:1)
     fn transfer_all() -> Weight {
-        (66_100_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(55_986_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: System Account (r:1 w:1)
     fn force_unreserve() -> Weight {
-        (34_060_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(31_510_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
 }
diff --git a/runtime/common/src/weights/pallet_bounties.rs b/runtime/common/src/weights/pallet_bounties.rs
index 8e0ba74b8..a8395f4f9 100644
--- a/runtime/common/src/weights/pallet_bounties.rs
+++ b/runtime/common/src/weights/pallet_bounties.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_bounties
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -51,83 +51,81 @@ impl<T: frame_system::Config> pallet_bounties::weights::WeightInfo for WeightInf
     // Storage: Bounties BountyCount (r:1 w:1)
     // Storage: Bounties BountyDescriptions (r:0 w:1)
     // Storage: Bounties Bounties (r:0 w:1)
-    fn propose_bounty(d: u32) -> Weight {
-        (47_153_000 as Weight)
-            // Standard Error: 0
-            .saturating_add((4_000 as Weight).saturating_mul(d as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+    fn propose_bounty(_d: u32) -> Weight {
+        Weight::from_ref_time(21_955_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: Bounties Bounties (r:1 w:1)
     // Storage: Bounties BountyApprovals (r:1 w:1)
     fn approve_bounty() -> Weight {
-        (20_440_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(8_866_000)
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Bounties Bounties (r:1 w:1)
     fn propose_curator() -> Weight {
-        (15_870_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(8_785_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Bounties Bounties (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn unassign_curator() -> Weight {
-        (55_740_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(25_616_000)
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Bounties Bounties (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn accept_curator() -> Weight {
-        (47_910_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(20_880_000)
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Bounties Bounties (r:1 w:1)
     fn award_bounty() -> Weight {
-        (37_650_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(16_661_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Bounties Bounties (r:1 w:1)
     // Storage: System Account (r:3 w:3)
     // Storage: Bounties BountyDescriptions (r:0 w:1)
     fn claim_bounty() -> Weight {
-        (128_800_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(5 as Weight))
+        Weight::from_ref_time(49_229_000)
+            .saturating_add(T::DbWeight::get().reads(4))
+            .saturating_add(T::DbWeight::get().writes(5))
     }
     // Storage: Bounties Bounties (r:1 w:1)
     // Storage: Bounties BountyDescriptions (r:0 w:1)
     fn close_bounty_proposed() -> Weight {
-        (59_260_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(25_929_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Bounties Bounties (r:1 w:1)
     // Storage: System Account (r:3 w:3)
     // Storage: Bounties BountyDescriptions (r:0 w:1)
     fn close_bounty_active() -> Weight {
-        (84_461_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(5 as Weight))
+        Weight::from_ref_time(38_633_000)
+            .saturating_add(T::DbWeight::get().reads(4))
+            .saturating_add(T::DbWeight::get().writes(5))
     }
     // Storage: Bounties Bounties (r:1 w:1)
     fn extend_bounty_expiry() -> Weight {
-        (32_200_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(16_045_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Bounties BountyApprovals (r:1 w:1)
     // Storage: Bounties Bounties (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn spend_funds(b: u32) -> Weight {
-        (0 as Weight)
-            // Standard Error: 142_000
-            .saturating_add((58_120_000 as Weight).saturating_mul(b as Weight))
-            .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(b as Weight)))
-            .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight)))
+        Weight::from_ref_time(21_790_000)
+            // Standard Error: 20_000
+            .saturating_add(Weight::from_ref_time(18_031_000).saturating_mul(b.into()))
+            .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(b.into())))
+            .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(b.into())))
     }
 }
diff --git a/runtime/common/src/weights/pallet_collective.rs b/runtime/common/src/weights/pallet_collective.rs
index 65ed5f343..02fb2345c 100644
--- a/runtime/common/src/weights/pallet_collective.rs
+++ b/runtime/common/src/weights/pallet_collective.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_collective
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -53,32 +53,34 @@ impl<T: frame_system::Config> pallet_collective::weights::WeightInfo for WeightI
     // Storage: AdvisoryCommittee Voting (r:255 w:255)
     // Storage: AdvisoryCommittee Prime (r:0 w:1)
     fn set_members(m: u32, _n: u32, p: u32) -> Weight {
-        (0 as Weight)
-            // Standard Error: 83_000
-            .saturating_add((56_925_000 as Weight).saturating_mul(m as Weight))
-            // Standard Error: 38_000
-            .saturating_add((30_621_000 as Weight).saturating_mul(p as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(p as Weight)))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
+        Weight::from_ref_time(0)
+            // Standard Error: 18_000
+            .saturating_add(Weight::from_ref_time(14_762_000).saturating_mul(m.into()))
+            // Standard Error: 7_000
+            .saturating_add(Weight::from_ref_time(7_686_000).saturating_mul(p.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
+            .saturating_add(T::DbWeight::get().writes(2))
+            .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
     }
     // Storage: AdvisoryCommittee Members (r:1 w:0)
     fn execute(b: u32, m: u32) -> Weight {
-        (36_706_000 as Weight)
+        Weight::from_ref_time(13_563_000)
             // Standard Error: 0
-            .saturating_add((1_000 as Weight).saturating_mul(b as Weight))
-            // Standard Error: 1_000
-            .saturating_add((41_000 as Weight).saturating_mul(m as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
+            .saturating_add(Weight::from_ref_time(1_000).saturating_mul(b.into()))
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(12_000).saturating_mul(m.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
     }
     // Storage: AdvisoryCommittee Members (r:1 w:0)
     // Storage: AdvisoryCommittee ProposalOf (r:1 w:0)
-    fn propose_execute(_b: u32, m: u32) -> Weight {
-        (48_486_000 as Weight)
-            // Standard Error: 5_000
-            .saturating_add((97_000 as Weight).saturating_mul(m as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
+    fn propose_execute(b: u32, m: u32) -> Weight {
+        Weight::from_ref_time(14_504_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(2_000).saturating_mul(b.into()))
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(18_000).saturating_mul(m.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
     }
     // Storage: AdvisoryCommittee Members (r:1 w:0)
     // Storage: AdvisoryCommittee ProposalOf (r:1 w:1)
@@ -86,50 +88,50 @@ impl<T: frame_system::Config> pallet_collective::weights::WeightInfo for WeightI
     // Storage: AdvisoryCommittee ProposalCount (r:1 w:1)
     // Storage: AdvisoryCommittee Voting (r:0 w:1)
     fn propose_proposed(b: u32, m: u32, p: u32) -> Weight {
-        (53_939_000 as Weight)
+        Weight::from_ref_time(21_145_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(4_000).saturating_mul(b.into()))
+            // Standard Error: 3_000
+            .saturating_add(Weight::from_ref_time(47_000).saturating_mul(m.into()))
             // Standard Error: 1_000
-            .saturating_add((10_000 as Weight).saturating_mul(b as Weight))
-            // Standard Error: 14_000
-            .saturating_add((163_000 as Weight).saturating_mul(m as Weight))
-            // Standard Error: 6_000
-            .saturating_add((382_000 as Weight).saturating_mul(p as Weight))
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(4 as Weight))
+            .saturating_add(Weight::from_ref_time(93_000).saturating_mul(p.into()))
+            .saturating_add(T::DbWeight::get().reads(4))
+            .saturating_add(T::DbWeight::get().writes(4))
     }
     // Storage: AdvisoryCommittee Members (r:1 w:0)
     // Storage: AdvisoryCommittee Voting (r:1 w:1)
     fn vote(m: u32) -> Weight {
-        (90_862_000 as Weight)
-            // Standard Error: 12_000
-            .saturating_add((277_000 as Weight).saturating_mul(m as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(32_864_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(50_000).saturating_mul(m.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: AdvisoryCommittee Voting (r:1 w:1)
     // Storage: AdvisoryCommittee Members (r:1 w:0)
     // Storage: AdvisoryCommittee Proposals (r:1 w:1)
     // Storage: AdvisoryCommittee ProposalOf (r:0 w:1)
     fn close_early_disapproved(_m: u32, p: u32) -> Weight {
-        (98_487_000 as Weight)
-            // Standard Error: 5_000
-            .saturating_add((273_000 as Weight).saturating_mul(p as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(36_748_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(74_000).saturating_mul(p.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: AdvisoryCommittee Voting (r:1 w:1)
     // Storage: AdvisoryCommittee Members (r:1 w:0)
     // Storage: AdvisoryCommittee ProposalOf (r:1 w:1)
     // Storage: AdvisoryCommittee Proposals (r:1 w:1)
     fn close_early_approved(b: u32, m: u32, p: u32) -> Weight {
-        (73_947_000 as Weight)
+        Weight::from_ref_time(29_133_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(3_000).saturating_mul(b.into()))
+            // Standard Error: 4_000
+            .saturating_add(Weight::from_ref_time(54_000).saturating_mul(m.into()))
             // Standard Error: 1_000
-            .saturating_add((13_000 as Weight).saturating_mul(b as Weight))
-            // Standard Error: 13_000
-            .saturating_add((239_000 as Weight).saturating_mul(m as Weight))
-            // Standard Error: 5_000
-            .saturating_add((340_000 as Weight).saturating_mul(p as Weight))
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+            .saturating_add(Weight::from_ref_time(99_000).saturating_mul(p.into()))
+            .saturating_add(T::DbWeight::get().reads(4))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: AdvisoryCommittee Voting (r:1 w:1)
     // Storage: AdvisoryCommittee Members (r:1 w:0)
@@ -137,11 +139,11 @@ impl<T: frame_system::Config> pallet_collective::weights::WeightInfo for WeightI
     // Storage: AdvisoryCommittee Proposals (r:1 w:1)
     // Storage: AdvisoryCommittee ProposalOf (r:0 w:1)
     fn close_disapproved(_m: u32, p: u32) -> Weight {
-        (100_924_000 as Weight)
-            // Standard Error: 5_000
-            .saturating_add((268_000 as Weight).saturating_mul(p as Weight))
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(35_689_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(81_000).saturating_mul(p.into()))
+            .saturating_add(T::DbWeight::get().reads(4))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: AdvisoryCommittee Voting (r:1 w:1)
     // Storage: AdvisoryCommittee Members (r:1 w:0)
@@ -149,24 +151,24 @@ impl<T: frame_system::Config> pallet_collective::weights::WeightInfo for WeightI
     // Storage: AdvisoryCommittee ProposalOf (r:1 w:1)
     // Storage: AdvisoryCommittee Proposals (r:1 w:1)
     fn close_approved(b: u32, m: u32, p: u32) -> Weight {
-        (101_633_000 as Weight)
+        Weight::from_ref_time(30_778_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(4_000).saturating_mul(b.into()))
+            // Standard Error: 4_000
+            .saturating_add(Weight::from_ref_time(50_000).saturating_mul(m.into()))
             // Standard Error: 1_000
-            .saturating_add((5_000 as Weight).saturating_mul(b as Weight))
-            // Standard Error: 12_000
-            .saturating_add((137_000 as Weight).saturating_mul(m as Weight))
-            // Standard Error: 5_000
-            .saturating_add((315_000 as Weight).saturating_mul(p as Weight))
-            .saturating_add(T::DbWeight::get().reads(5 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+            .saturating_add(Weight::from_ref_time(98_000).saturating_mul(p.into()))
+            .saturating_add(T::DbWeight::get().reads(5))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: AdvisoryCommittee Proposals (r:1 w:1)
     // Storage: AdvisoryCommittee Voting (r:0 w:1)
     // Storage: AdvisoryCommittee ProposalOf (r:0 w:1)
     fn disapprove_proposal(p: u32) -> Weight {
-        (45_138_000 as Weight)
-            // Standard Error: 8_000
-            .saturating_add((361_000 as Weight).saturating_mul(p as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(20_708_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(86_000).saturating_mul(p.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
 }
diff --git a/runtime/common/src/weights/pallet_democracy.rs b/runtime/common/src/weights/pallet_democracy.rs
index 774083caa..5b63a09b6 100644
--- a/runtime/common/src/weights/pallet_democracy.rs
+++ b/runtime/common/src/weights/pallet_democracy.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_democracy
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -53,44 +53,44 @@ impl<T: frame_system::Config> pallet_democracy::weights::WeightInfo for WeightIn
     // Storage: Democracy Blacklist (r:1 w:0)
     // Storage: Democracy DepositOf (r:0 w:1)
     fn propose() -> Weight {
-        (99_190_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(40_195_000)
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: Democracy DepositOf (r:1 w:1)
     fn second(s: u32) -> Weight {
-        (50_566_000 as Weight)
-            // Standard Error: 7_000
-            .saturating_add((445_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(24_123_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(106_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Democracy ReferendumInfoOf (r:1 w:1)
     // Storage: Democracy VotingOf (r:1 w:1)
     // Storage: Balances Locks (r:1 w:1)
     fn vote_new(r: u32) -> Weight {
-        (72_516_000 as Weight)
-            // Standard Error: 12_000
-            .saturating_add((405_000 as Weight).saturating_mul(r as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(32_847_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(139_000).saturating_mul(r.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: Democracy ReferendumInfoOf (r:1 w:1)
     // Storage: Democracy VotingOf (r:1 w:1)
     // Storage: Balances Locks (r:1 w:1)
     fn vote_existing(r: u32) -> Weight {
-        (69_938_000 as Weight)
-            // Standard Error: 18_000
-            .saturating_add((449_000 as Weight).saturating_mul(r as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(31_794_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(161_000).saturating_mul(r.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: Democracy ReferendumInfoOf (r:1 w:1)
     // Storage: Democracy Cancellations (r:1 w:1)
     fn emergency_cancel() -> Weight {
-        (34_740_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(13_836_000)
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Democracy PublicProps (r:1 w:1)
     // Storage: Democracy NextExternal (r:1 w:1)
@@ -99,79 +99,79 @@ impl<T: frame_system::Config> pallet_democracy::weights::WeightInfo for WeightIn
     // Storage: Democracy DepositOf (r:1 w:1)
     // Storage: System Account (r:2 w:2)
     fn blacklist(p: u32) -> Weight {
-        (102_527_000 as Weight)
-            // Standard Error: 17_000
-            .saturating_add((650_000 as Weight).saturating_mul(p as Weight))
-            .saturating_add(T::DbWeight::get().reads(6 as Weight))
-            .saturating_add(T::DbWeight::get().writes(7 as Weight))
+        Weight::from_ref_time(43_484_000)
+            // Standard Error: 5_000
+            .saturating_add(Weight::from_ref_time(210_000).saturating_mul(p.into()))
+            .saturating_add(T::DbWeight::get().reads(6))
+            .saturating_add(T::DbWeight::get().writes(7))
     }
     // Storage: Democracy NextExternal (r:1 w:1)
     // Storage: Democracy Blacklist (r:1 w:0)
     fn external_propose(v: u32) -> Weight {
-        (22_773_000 as Weight)
-            // Standard Error: 1_000
-            .saturating_add((47_000 as Weight).saturating_mul(v as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(10_959_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(12_000).saturating_mul(v.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Democracy NextExternal (r:0 w:1)
     fn external_propose_majority() -> Weight {
-        (7_420_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(3_128_000).saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Democracy NextExternal (r:0 w:1)
     fn external_propose_default() -> Weight {
-        (7_880_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(3_086_000).saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Democracy NextExternal (r:1 w:1)
     // Storage: Democracy ReferendumCount (r:1 w:1)
     // Storage: Democracy ReferendumInfoOf (r:0 w:1)
     fn fast_track() -> Weight {
-        (35_750_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(15_486_000)
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: Democracy NextExternal (r:1 w:1)
     // Storage: Democracy Blacklist (r:1 w:1)
     fn veto_external(v: u32) -> Weight {
-        (42_116_000 as Weight)
-            // Standard Error: 4_000
-            .saturating_add((46_000 as Weight).saturating_mul(v as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(16_743_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(34_000).saturating_mul(v.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Democracy PublicProps (r:1 w:1)
     // Storage: Democracy DepositOf (r:1 w:1)
     // Storage: System Account (r:2 w:2)
     fn cancel_proposal(p: u32) -> Weight {
-        (79_688_000 as Weight)
-            // Standard Error: 12_000
-            .saturating_add((679_000 as Weight).saturating_mul(p as Weight))
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(4 as Weight))
+        Weight::from_ref_time(38_156_000)
+            // Standard Error: 4_000
+            .saturating_add(Weight::from_ref_time(159_000).saturating_mul(p.into()))
+            .saturating_add(T::DbWeight::get().reads(4))
+            .saturating_add(T::DbWeight::get().writes(4))
     }
     // Storage: Democracy ReferendumInfoOf (r:0 w:1)
     fn cancel_referendum() -> Weight {
-        (24_280_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(9_907_000).saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Scheduler Lookup (r:1 w:1)
     // Storage: Scheduler Agenda (r:1 w:1)
     fn cancel_queued(r: u32) -> Weight {
-        (39_489_000 as Weight)
-            // Standard Error: 18_000
-            .saturating_add((1_227_000 as Weight).saturating_mul(r as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(19_173_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(331_000).saturating_mul(r.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Democracy LowestUnbaked (r:1 w:1)
     // Storage: Democracy ReferendumCount (r:1 w:0)
     // Storage: Democracy ReferendumInfoOf (r:1 w:0)
     fn on_initialize_base(r: u32) -> Weight {
-        (9_262_000 as Weight)
-            // Standard Error: 23_000
-            .saturating_add((6_409_000 as Weight).saturating_mul(r as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(9_098_000)
+            // Standard Error: 9_000
+            .saturating_add(Weight::from_ref_time(1_561_000).saturating_mul(r.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Democracy LowestUnbaked (r:1 w:1)
     // Storage: Democracy ReferendumCount (r:1 w:0)
@@ -180,101 +180,99 @@ impl<T: frame_system::Config> pallet_democracy::weights::WeightInfo for WeightIn
     // Storage: Democracy PublicProps (r:1 w:0)
     // Storage: Democracy ReferendumInfoOf (r:1 w:0)
     fn on_initialize_base_with_launch_period(r: u32) -> Weight {
-        (12_094_000 as Weight)
-            // Standard Error: 17_000
-            .saturating_add((6_467_000 as Weight).saturating_mul(r as Weight))
-            .saturating_add(T::DbWeight::get().reads(5 as Weight))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(9_662_000)
+            // Standard Error: 3_000
+            .saturating_add(Weight::from_ref_time(1_583_000).saturating_mul(r.into()))
+            .saturating_add(T::DbWeight::get().reads(5))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Democracy VotingOf (r:3 w:3)
     // Storage: Democracy ReferendumInfoOf (r:1 w:1)
     // Storage: Balances Locks (r:1 w:1)
     fn delegate(r: u32) -> Weight {
-        (63_558_000 as Weight)
-            // Standard Error: 53_000
-            .saturating_add((9_035_000 as Weight).saturating_mul(r as Weight))
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
-            .saturating_add(T::DbWeight::get().writes(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
+        Weight::from_ref_time(32_862_000)
+            // Standard Error: 4_000
+            .saturating_add(Weight::from_ref_time(2_398_000).saturating_mul(r.into()))
+            .saturating_add(T::DbWeight::get().reads(4))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+            .saturating_add(T::DbWeight::get().writes(4))
+            .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
     }
     // Storage: Democracy VotingOf (r:2 w:2)
     // Storage: Democracy ReferendumInfoOf (r:1 w:1)
     fn undelegate(r: u32) -> Weight {
-        (33_478_000 as Weight)
-            // Standard Error: 42_000
-            .saturating_add((8_797_000 as Weight).saturating_mul(r as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
+        Weight::from_ref_time(20_469_000)
+            // Standard Error: 4_000
+            .saturating_add(Weight::from_ref_time(2_361_000).saturating_mul(r.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+            .saturating_add(T::DbWeight::get().writes(2))
+            .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
     }
     // Storage: Democracy PublicProps (r:0 w:1)
     fn clear_public_proposals() -> Weight {
-        (9_400_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(3_880_000).saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Democracy Preimages (r:1 w:1)
     fn note_preimage(b: u32) -> Weight {
-        (53_547_000 as Weight)
+        Weight::from_ref_time(21_894_000)
             // Standard Error: 0
-            .saturating_add((4_000 as Weight).saturating_mul(b as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+            .saturating_add(Weight::from_ref_time(1_000).saturating_mul(b.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Democracy Preimages (r:1 w:1)
     fn note_imminent_preimage(b: u32) -> Weight {
-        (35_292_000 as Weight)
+        Weight::from_ref_time(16_638_000)
             // Standard Error: 0
-            .saturating_add((4_000 as Weight).saturating_mul(b as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+            .saturating_add(Weight::from_ref_time(1_000).saturating_mul(b.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Democracy Preimages (r:1 w:1)
-    // Storage: System Account (r:1 w:0)
-    fn reap_preimage(b: u32) -> Weight {
-        (53_182_000 as Weight)
-            // Standard Error: 0
-            .saturating_add((2_000 as Weight).saturating_mul(b as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+    // Storage: System Account (r:1 w:1)
+    fn reap_preimage(_b: u32) -> Weight {
+        Weight::from_ref_time(28_888_000)
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Democracy VotingOf (r:1 w:1)
     // Storage: Balances Locks (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn unlock_remove(r: u32) -> Weight {
-        (45_241_000 as Weight)
-            // Standard Error: 7_000
-            .saturating_add((213_000 as Weight).saturating_mul(r as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(24_713_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(81_000).saturating_mul(r.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: Democracy VotingOf (r:1 w:1)
     // Storage: Balances Locks (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn unlock_set(r: u32) -> Weight {
-        (44_693_000 as Weight)
-            // Standard Error: 7_000
-            .saturating_add((361_000 as Weight).saturating_mul(r as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(23_404_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(133_000).saturating_mul(r.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: Democracy ReferendumInfoOf (r:1 w:1)
     // Storage: Democracy VotingOf (r:1 w:1)
     fn remove_vote(r: u32) -> Weight {
-        (27_874_000 as Weight)
-            // Standard Error: 6_000
-            .saturating_add((371_000 as Weight).saturating_mul(r as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(13_571_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(142_000).saturating_mul(r.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Democracy ReferendumInfoOf (r:1 w:1)
     // Storage: Democracy VotingOf (r:1 w:1)
     fn remove_other_vote(r: u32) -> Weight {
-        (29_844_000 as Weight)
-            // Standard Error: 6_000
-            .saturating_add((340_000 as Weight).saturating_mul(r as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(13_683_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(143_000).saturating_mul(r.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
 }
diff --git a/runtime/common/src/weights/pallet_grandpa.rs b/runtime/common/src/weights/pallet_grandpa.rs
index 52c00e8d1..24be43b6a 100644
--- a/runtime/common/src/weights/pallet_grandpa.rs
+++ b/runtime/common/src/weights/pallet_grandpa.rs
@@ -49,20 +49,20 @@ impl<T: frame_system::Config> pallet_grandpa::weights::WeightInfo for WeightInfo
 
 
     fn check_equivocation_proof(x: u32, ) -> Weight {
-        (206_093_000 as Weight)
+        Weight::from_ref_time(206_093_000)
         
         // Standard Error: 82_000
 
-            .saturating_add((33_636_000 as Weight).saturating_mul(x as Weight))
+            .saturating_add(Weight::from_ref_time(33_636_000).saturating_mul(x as u64))
 
     }
 
         // Storage: Grandpa Stalled (r:0 w:1)
 
     fn note_stalled() -> Weight {
-        (6_440_000 as Weight)
+        Weight::from_ref_time(6_440_000)
 
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+            .saturating_add(T::DbWeight::get().writes(1 as u64))
 
     }
 }
diff --git a/runtime/common/src/weights/pallet_identity.rs b/runtime/common/src/weights/pallet_identity.rs
index 633f7700a..e7d61f6ea 100644
--- a/runtime/common/src/weights/pallet_identity.rs
+++ b/runtime/common/src/weights/pallet_identity.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_identity
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -50,162 +50,168 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_identity::weights::WeightInfo for WeightInfo<T> {
     // Storage: Identity Registrars (r:1 w:1)
     fn add_registrar(r: u32) -> Weight {
-        (27_815_000 as Weight)
-            // Standard Error: 44_000
-            .saturating_add((436_000 as Weight).saturating_mul(r as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(12_196_000)
+            // Standard Error: 5_000
+            .saturating_add(Weight::from_ref_time(376_000).saturating_mul(r.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Identity IdentityOf (r:1 w:1)
-    fn set_identity(_r: u32, x: u32) -> Weight {
-        (57_184_000 as Weight)
-            // Standard Error: 10_000
-            .saturating_add((740_000 as Weight).saturating_mul(x as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+    fn set_identity(r: u32, x: u32) -> Weight {
+        Weight::from_ref_time(23_488_000)
+            // Standard Error: 15_000
+            .saturating_add(Weight::from_ref_time(384_000).saturating_mul(r.into()))
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(200_000).saturating_mul(x.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Identity IdentityOf (r:1 w:0)
     // Storage: Identity SubsOf (r:1 w:1)
     // Storage: Identity SuperOf (r:1 w:1)
     fn set_subs_new(s: u32) -> Weight {
-        (74_862_000 as Weight)
-            // Standard Error: 54_000
-            .saturating_add((5_540_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+        Weight::from_ref_time(22_648_000)
+            // Standard Error: 4_000
+            .saturating_add(Weight::from_ref_time(1_755_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into())))
+            .saturating_add(T::DbWeight::get().writes(1))
+            .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
     }
     // Storage: Identity IdentityOf (r:1 w:0)
     // Storage: Identity SubsOf (r:1 w:1)
     // Storage: Identity SuperOf (r:0 w:1)
     fn set_subs_old(p: u32) -> Weight {
-        (51_247_000 as Weight)
-            // Standard Error: 35_000
-            .saturating_add((2_194_000 as Weight).saturating_mul(p as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
+        Weight::from_ref_time(22_847_000)
+            // Standard Error: 3_000
+            .saturating_add(Weight::from_ref_time(781_000).saturating_mul(p.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(1))
+            .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
     }
     // Storage: Identity SubsOf (r:1 w:1)
     // Storage: Identity IdentityOf (r:1 w:1)
     // Storage: Identity SuperOf (r:0 w:64)
     fn clear_identity(r: u32, s: u32, x: u32) -> Weight {
-        (48_392_000 as Weight)
-            // Standard Error: 563_000
-            .saturating_add((1_925_000 as Weight).saturating_mul(r as Weight))
-            // Standard Error: 32_000
-            .saturating_add((2_195_000 as Weight).saturating_mul(s as Weight))
-            // Standard Error: 32_000
-            .saturating_add((365_000 as Weight).saturating_mul(x as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+        Weight::from_ref_time(26_919_000)
+            // Standard Error: 18_000
+            .saturating_add(Weight::from_ref_time(141_000).saturating_mul(r.into()))
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(808_000).saturating_mul(s.into()))
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(79_000).saturating_mul(x.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
+            .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
     }
     // Storage: Identity Registrars (r:1 w:0)
     // Storage: Identity IdentityOf (r:1 w:1)
     fn request_judgement(r: u32, x: u32) -> Weight {
-        (40_879_000 as Weight)
-            // Standard Error: 99_000
-            .saturating_add((2_118_000 as Weight).saturating_mul(r as Weight))
-            // Standard Error: 6_000
-            .saturating_add((924_000 as Weight).saturating_mul(x as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(24_741_000)
+            // Standard Error: 9_000
+            .saturating_add(Weight::from_ref_time(381_000).saturating_mul(r.into()))
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(206_000).saturating_mul(x.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Identity IdentityOf (r:1 w:1)
-    fn cancel_request(_r: u32, x: u32) -> Weight {
-        (73_831_000 as Weight)
-            // Standard Error: 24_000
-            .saturating_add((583_000 as Weight).saturating_mul(x as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+    fn cancel_request(r: u32, x: u32) -> Weight {
+        Weight::from_ref_time(23_484_000)
+            // Standard Error: 8_000
+            .saturating_add(Weight::from_ref_time(251_000).saturating_mul(r.into()))
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(202_000).saturating_mul(x.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Identity Registrars (r:1 w:1)
     fn set_fee(r: u32) -> Weight {
-        (13_827_000 as Weight)
-            // Standard Error: 31_000
-            .saturating_add((315_000 as Weight).saturating_mul(r as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(6_477_000)
+            // Standard Error: 3_000
+            .saturating_add(Weight::from_ref_time(262_000).saturating_mul(r.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Identity Registrars (r:1 w:1)
     fn set_account_id(r: u32) -> Weight {
-        (13_142_000 as Weight)
-            // Standard Error: 31_000
-            .saturating_add((703_000 as Weight).saturating_mul(r as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(6_698_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(242_000).saturating_mul(r.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Identity Registrars (r:1 w:1)
     fn set_fields(r: u32) -> Weight {
-        (15_301_000 as Weight)
-            // Standard Error: 17_000
-            .saturating_add((435_000 as Weight).saturating_mul(r as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(6_546_000)
+            // Standard Error: 3_000
+            .saturating_add(Weight::from_ref_time(244_000).saturating_mul(r.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Identity Registrars (r:1 w:0)
     // Storage: Identity IdentityOf (r:1 w:1)
     fn provide_judgement(r: u32, x: u32) -> Weight {
-        (48_594_000 as Weight)
-            // Standard Error: 112_000
-            .saturating_add((16_000 as Weight).saturating_mul(r as Weight))
-            // Standard Error: 6_000
-            .saturating_add((678_000 as Weight).saturating_mul(x as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(18_426_000)
+            // Standard Error: 7_000
+            .saturating_add(Weight::from_ref_time(300_000).saturating_mul(r.into()))
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(340_000).saturating_mul(x.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Identity SubsOf (r:1 w:1)
     // Storage: Identity IdentityOf (r:1 w:1)
     // Storage: System Account (r:2 w:2)
     // Storage: Identity SuperOf (r:0 w:64)
-    fn kill_identity(r: u32, s: u32, _x: u32) -> Weight {
-        (102_128_000 as Weight)
-            // Standard Error: 661_000
-            .saturating_add((193_000 as Weight).saturating_mul(r as Weight))
-            // Standard Error: 38_000
-            .saturating_add((1_874_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+    fn kill_identity(r: u32, s: u32, x: u32) -> Weight {
+        Weight::from_ref_time(31_309_000)
+            // Standard Error: 21_000
+            .saturating_add(Weight::from_ref_time(306_000).saturating_mul(r.into()))
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(823_000).saturating_mul(s.into()))
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(108_000).saturating_mul(x.into()))
+            .saturating_add(T::DbWeight::get().reads(4))
+            .saturating_add(T::DbWeight::get().writes(4))
+            .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
     }
     // Storage: Identity IdentityOf (r:1 w:0)
     // Storage: Identity SuperOf (r:1 w:1)
     // Storage: Identity SubsOf (r:1 w:1)
     fn add_sub(s: u32) -> Weight {
-        (66_983_000 as Weight)
-            // Standard Error: 8_000
-            .saturating_add((172_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(27_995_000)
+            // Standard Error: 5_000
+            .saturating_add(Weight::from_ref_time(111_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Identity IdentityOf (r:1 w:0)
     // Storage: Identity SuperOf (r:1 w:1)
     fn rename_sub(s: u32) -> Weight {
-        (24_681_000 as Weight)
-            // Standard Error: 10_000
-            .saturating_add((104_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(11_323_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(73_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Identity IdentityOf (r:1 w:0)
     // Storage: Identity SuperOf (r:1 w:1)
     // Storage: Identity SubsOf (r:1 w:1)
     fn remove_sub(s: u32) -> Weight {
-        (63_074_000 as Weight)
-            // Standard Error: 8_000
-            .saturating_add((274_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(28_284_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(127_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Identity SuperOf (r:1 w:1)
     // Storage: Identity SubsOf (r:1 w:1)
     fn quit_sub(s: u32) -> Weight {
-        (46_651_000 as Weight)
-            // Standard Error: 17_000
-            .saturating_add((252_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(20_753_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(107_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
 }
diff --git a/runtime/common/src/weights/pallet_membership.rs b/runtime/common/src/weights/pallet_membership.rs
index 8c41f7c7d..d5af66791 100644
--- a/runtime/common/src/weights/pallet_membership.rs
+++ b/runtime/common/src/weights/pallet_membership.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_membership
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -53,21 +53,23 @@ impl<T: frame_system::Config> pallet_membership::weights::WeightInfo for WeightI
     // Storage: AdvisoryCommittee Members (r:0 w:1)
     // Storage: AdvisoryCommittee Prime (r:0 w:1)
     fn add_member(m: u32) -> Weight {
-        (29_252_000 as Weight)
-            // Standard Error: 2_000
-            .saturating_add((129_000 as Weight).saturating_mul(m as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(15_484_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(31_000).saturating_mul(m.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: AdvisoryCommitteeMembership Members (r:1 w:1)
     // Storage: AdvisoryCommittee Proposals (r:1 w:0)
     // Storage: AdvisoryCommitteeMembership Prime (r:1 w:0)
     // Storage: AdvisoryCommittee Members (r:0 w:1)
     // Storage: AdvisoryCommittee Prime (r:0 w:1)
-    fn remove_member(_m: u32) -> Weight {
-        (42_627_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+    fn remove_member(m: u32) -> Weight {
+        Weight::from_ref_time(17_584_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(28_000).saturating_mul(m.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: AdvisoryCommitteeMembership Members (r:1 w:1)
     // Storage: AdvisoryCommittee Proposals (r:1 w:0)
@@ -75,11 +77,11 @@ impl<T: frame_system::Config> pallet_membership::weights::WeightInfo for WeightI
     // Storage: AdvisoryCommittee Members (r:0 w:1)
     // Storage: AdvisoryCommittee Prime (r:0 w:1)
     fn swap_member(m: u32) -> Weight {
-        (31_151_000 as Weight)
-            // Standard Error: 1_000
-            .saturating_add((199_000 as Weight).saturating_mul(m as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(17_575_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(32_000).saturating_mul(m.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: AdvisoryCommitteeMembership Members (r:1 w:1)
     // Storage: AdvisoryCommittee Proposals (r:1 w:0)
@@ -87,11 +89,11 @@ impl<T: frame_system::Config> pallet_membership::weights::WeightInfo for WeightI
     // Storage: AdvisoryCommittee Members (r:0 w:1)
     // Storage: AdvisoryCommittee Prime (r:0 w:1)
     fn reset_member(m: u32) -> Weight {
-        (33_891_000 as Weight)
-            // Standard Error: 8_000
-            .saturating_add((351_000 as Weight).saturating_mul(m as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(17_200_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(103_000).saturating_mul(m.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: AdvisoryCommitteeMembership Members (r:1 w:1)
     // Storage: AdvisoryCommittee Proposals (r:1 w:0)
@@ -99,28 +101,28 @@ impl<T: frame_system::Config> pallet_membership::weights::WeightInfo for WeightI
     // Storage: AdvisoryCommittee Members (r:0 w:1)
     // Storage: AdvisoryCommittee Prime (r:0 w:1)
     fn change_key(m: u32) -> Weight {
-        (40_274_000 as Weight)
-            // Standard Error: 2_000
-            .saturating_add((36_000 as Weight).saturating_mul(m as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(4 as Weight))
+        Weight::from_ref_time(17_951_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(34_000).saturating_mul(m.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(4))
     }
     // Storage: AdvisoryCommitteeMembership Members (r:1 w:0)
     // Storage: AdvisoryCommitteeMembership Prime (r:0 w:1)
     // Storage: AdvisoryCommittee Prime (r:0 w:1)
     fn set_prime(m: u32) -> Weight {
-        (8_503_000 as Weight)
+        Weight::from_ref_time(6_406_000)
             // Standard Error: 0
-            .saturating_add((67_000 as Weight).saturating_mul(m as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+            .saturating_add(Weight::from_ref_time(11_000).saturating_mul(m.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: AdvisoryCommitteeMembership Prime (r:0 w:1)
     // Storage: AdvisoryCommittee Prime (r:0 w:1)
     fn clear_prime(m: u32) -> Weight {
-        (3_299_000 as Weight)
+        Weight::from_ref_time(3_667_000)
             // Standard Error: 0
-            .saturating_add((2_000 as Weight).saturating_mul(m as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+            .saturating_add(Weight::from_ref_time(1_000).saturating_mul(m.into()))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
 }
diff --git a/runtime/common/src/weights/pallet_multisig.rs b/runtime/common/src/weights/pallet_multisig.rs
index 956a787df..7ada45474 100644
--- a/runtime/common/src/weights/pallet_multisig.rs
+++ b/runtime/common/src/weights/pallet_multisig.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_multisig
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -48,102 +48,100 @@ use frame_support::{
 /// Weight functions for pallet_multisig (automatically generated)
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_multisig::weights::WeightInfo for WeightInfo<T> {
-    fn as_multi_threshold_1(z: u32) -> Weight {
-        (38_915_000 as Weight)
-            // Standard Error: 0
-            .saturating_add((1_000 as Weight).saturating_mul(z as Weight))
+    fn as_multi_threshold_1(_z: u32) -> Weight {
+        Weight::from_ref_time(14_433_000)
     }
     // Storage: MultiSig Multisigs (r:1 w:1)
     // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
     fn as_multi_create(s: u32, z: u32) -> Weight {
-        (85_862_000 as Weight)
-            // Standard Error: 15_000
-            .saturating_add((208_000 as Weight).saturating_mul(s as Weight))
+        Weight::from_ref_time(26_712_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(82_000).saturating_mul(s.into()))
             // Standard Error: 0
-            .saturating_add((1_000 as Weight).saturating_mul(z as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+            .saturating_add(Weight::from_ref_time(1_000).saturating_mul(z.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: MultiSig Multisigs (r:1 w:1)
     // Storage: MultiSig Calls (r:1 w:1)
     // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
     fn as_multi_create_store(s: u32, z: u32) -> Weight {
-        (73_237_000 as Weight)
-            // Standard Error: 9_000
-            .saturating_add((243_000 as Weight).saturating_mul(s as Weight))
+        Weight::from_ref_time(28_175_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(78_000).saturating_mul(s.into()))
             // Standard Error: 0
-            .saturating_add((4_000 as Weight).saturating_mul(z as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+            .saturating_add(Weight::from_ref_time(1_000).saturating_mul(z.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: MultiSig Multisigs (r:1 w:1)
     fn as_multi_approve(s: u32, z: u32) -> Weight {
-        (52_952_000 as Weight)
-            // Standard Error: 8_000
-            .saturating_add((163_000 as Weight).saturating_mul(s as Weight))
+        Weight::from_ref_time(20_530_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(70_000).saturating_mul(s.into()))
             // Standard Error: 0
-            .saturating_add((2_000 as Weight).saturating_mul(z as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+            .saturating_add(Weight::from_ref_time(1_000).saturating_mul(z.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: MultiSig Multisigs (r:1 w:1)
     // Storage: MultiSig Calls (r:1 w:1)
     fn as_multi_approve_store(s: u32, z: u32) -> Weight {
-        (68_506_000 as Weight)
-            // Standard Error: 10_000
-            .saturating_add((213_000 as Weight).saturating_mul(s as Weight))
+        Weight::from_ref_time(29_734_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(73_000).saturating_mul(s.into()))
             // Standard Error: 0
-            .saturating_add((4_000 as Weight).saturating_mul(z as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+            .saturating_add(Weight::from_ref_time(1_000).saturating_mul(z.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: MultiSig Multisigs (r:1 w:1)
     // Storage: MultiSig Calls (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn as_multi_complete(s: u32, z: u32) -> Weight {
-        (81_537_000 as Weight)
-            // Standard Error: 13_000
-            .saturating_add((460_000 as Weight).saturating_mul(s as Weight))
+        Weight::from_ref_time(35_958_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(108_000).saturating_mul(s.into()))
             // Standard Error: 0
-            .saturating_add((5_000 as Weight).saturating_mul(z as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+            .saturating_add(Weight::from_ref_time(1_000).saturating_mul(z.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: MultiSig Multisigs (r:1 w:1)
     // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
     fn approve_as_multi_create(s: u32) -> Weight {
-        (68_980_000 as Weight)
-            // Standard Error: 10_000
-            .saturating_add((211_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(23_697_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(98_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: MultiSig Multisigs (r:1 w:1)
     // Storage: MultiSig Calls (r:1 w:0)
     fn approve_as_multi_approve(s: u32) -> Weight {
-        (39_761_000 as Weight)
-            // Standard Error: 9_000
-            .saturating_add((296_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(16_611_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(100_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: MultiSig Multisigs (r:1 w:1)
     // Storage: MultiSig Calls (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn approve_as_multi_complete(s: u32) -> Weight {
-        (121_916_000 as Weight)
-            // Standard Error: 15_000
-            .saturating_add((496_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(40_814_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(136_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: MultiSig Multisigs (r:1 w:1)
     // Storage: MultiSig Calls (r:1 w:1)
     fn cancel_as_multi(s: u32) -> Weight {
-        (93_947_000 as Weight)
-            // Standard Error: 20_000
-            .saturating_add((293_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(35_582_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(92_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
 }
diff --git a/runtime/common/src/weights/pallet_parachain_staking.rs b/runtime/common/src/weights/pallet_parachain_staking.rs
index 12b75e0ae..1d2055a00 100644
--- a/runtime/common/src/weights/pallet_parachain_staking.rs
+++ b/runtime/common/src/weights/pallet_parachain_staking.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_parachain_staking
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -50,49 +50,49 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_parachain_staking::weights::WeightInfo for WeightInfo<T> {
     // Storage: ParachainStaking InflationConfig (r:1 w:1)
     fn set_staking_expectations() -> Weight {
-        (30_011_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(12_772_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: ParachainStaking InflationConfig (r:1 w:1)
     // Storage: ParachainStaking Round (r:1 w:0)
     fn set_inflation() -> Weight {
-        (86_350_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(35_128_000)
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: ParachainStaking ParachainBondInfo (r:1 w:1)
     fn set_parachain_bond_account() -> Weight {
-        (29_470_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(12_556_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: ParachainStaking ParachainBondInfo (r:1 w:1)
     fn set_parachain_bond_reserve_percent() -> Weight {
-        (31_920_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(11_823_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: ParachainStaking TotalSelected (r:1 w:1)
     // Storage: ParachainStaking Round (r:1 w:0)
     fn set_total_selected() -> Weight {
-        (32_160_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(13_791_000)
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: ParachainStaking CollatorCommission (r:1 w:1)
     fn set_collator_commission() -> Weight {
-        (31_010_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(11_749_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: ParachainStaking Round (r:1 w:1)
     // Storage: ParachainStaking TotalSelected (r:1 w:0)
     // Storage: ParachainStaking InflationConfig (r:1 w:1)
     fn set_blocks_per_round() -> Weight {
-        (109_270_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(36_619_000)
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     // Storage: ParachainStaking DelegatorState (r:1 w:0)
@@ -103,21 +103,21 @@ impl<T: frame_system::Config> pallet_parachain_staking::weights::WeightInfo for
     // Storage: ParachainStaking TopDelegations (r:0 w:1)
     // Storage: ParachainStaking BottomDelegations (r:0 w:1)
     fn join_candidates(x: u32) -> Weight {
-        (176_454_000 as Weight)
-            // Standard Error: 4_000
-            .saturating_add((181_000 as Weight).saturating_mul(x as Weight))
-            .saturating_add(T::DbWeight::get().reads(6 as Weight))
-            .saturating_add(T::DbWeight::get().writes(7 as Weight))
+        Weight::from_ref_time(31_483_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(198_000).saturating_mul(x.into()))
+            .saturating_add(T::DbWeight::get().reads(6))
+            .saturating_add(T::DbWeight::get().writes(7))
     }
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     // Storage: ParachainStaking Round (r:1 w:0)
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     fn schedule_leave_candidates(x: u32) -> Weight {
-        (142_707_000 as Weight)
-            // Standard Error: 5_000
-            .saturating_add((164_000 as Weight).saturating_mul(x as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(26_529_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(175_000).saturating_mul(x.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     // Storage: ParachainStaking Round (r:1 w:0)
@@ -126,39 +126,40 @@ impl<T: frame_system::Config> pallet_parachain_staking::weights::WeightInfo for
     // Storage: Balances Locks (r:2 w:2)
     // Storage: System Account (r:2 w:2)
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1)
+    // Storage: ParachainStaking AutoCompoundingDelegations (r:1 w:1)
     // Storage: ParachainStaking BottomDelegations (r:1 w:1)
     // Storage: ParachainStaking Total (r:1 w:1)
     fn execute_leave_candidates(x: u32) -> Weight {
-        (0 as Weight)
-            // Standard Error: 231_000
-            .saturating_add((64_246_000 as Weight).saturating_mul(x as Weight))
-            .saturating_add(T::DbWeight::get().reads(5 as Weight))
-            .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(x as Weight)))
-            .saturating_add(T::DbWeight::get().writes(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(x as Weight)))
+        Weight::from_ref_time(0)
+            // Standard Error: 54_000
+            .saturating_add(Weight::from_ref_time(17_144_000).saturating_mul(x.into()))
+            .saturating_add(T::DbWeight::get().reads(6))
+            .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(x.into())))
+            .saturating_add(T::DbWeight::get().writes(5))
+            .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(x.into())))
     }
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     fn cancel_leave_candidates(x: u32) -> Weight {
-        (140_788_000 as Weight)
-            // Standard Error: 4_000
-            .saturating_add((168_000 as Weight).saturating_mul(x as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(24_767_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(187_000).saturating_mul(x.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     fn go_offline() -> Weight {
-        (42_920_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(19_040_000)
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     fn go_online() -> Weight {
-        (41_760_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(20_273_000)
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     // Storage: System Account (r:1 w:1)
@@ -166,16 +167,16 @@ impl<T: frame_system::Config> pallet_parachain_staking::weights::WeightInfo for
     // Storage: Balances Locks (r:1 w:1)
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     fn candidate_bond_more() -> Weight {
-        (70_700_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(5 as Weight))
-            .saturating_add(T::DbWeight::get().writes(5 as Weight))
+        Weight::from_ref_time(34_300_000)
+            .saturating_add(T::DbWeight::get().reads(5))
+            .saturating_add(T::DbWeight::get().writes(5))
     }
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     // Storage: ParachainStaking Round (r:1 w:0)
     fn schedule_candidate_bond_less() -> Weight {
-        (40_220_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(18_608_000)
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     // Storage: ParachainStaking Round (r:1 w:0)
@@ -184,15 +185,15 @@ impl<T: frame_system::Config> pallet_parachain_staking::weights::WeightInfo for
     // Storage: System Account (r:1 w:1)
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     fn execute_candidate_bond_less() -> Weight {
-        (72_820_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(6 as Weight))
-            .saturating_add(T::DbWeight::get().writes(5 as Weight))
+        Weight::from_ref_time(39_891_000)
+            .saturating_add(T::DbWeight::get().reads(6))
+            .saturating_add(T::DbWeight::get().writes(5))
     }
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     fn cancel_candidate_bond_less() -> Weight {
-        (28_360_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(17_010_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: System Account (r:1 w:1)
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
@@ -202,21 +203,21 @@ impl<T: frame_system::Config> pallet_parachain_staking::weights::WeightInfo for
     // Storage: Balances Locks (r:1 w:1)
     // Storage: ParachainStaking Total (r:1 w:1)
     fn delegate(x: u32, y: u32) -> Weight {
-        (275_442_000 as Weight)
-            // Standard Error: 33_000
-            .saturating_add((59_000 as Weight).saturating_mul(x as Weight))
-            // Standard Error: 11_000
-            .saturating_add((281_000 as Weight).saturating_mul(y as Weight))
-            .saturating_add(T::DbWeight::get().reads(7 as Weight))
-            .saturating_add(T::DbWeight::get().writes(7 as Weight))
+        Weight::from_ref_time(79_992_000)
+            // Standard Error: 10_000
+            .saturating_add(Weight::from_ref_time(123_000).saturating_mul(x.into()))
+            // Standard Error: 3_000
+            .saturating_add(Weight::from_ref_time(132_000).saturating_mul(y.into()))
+            .saturating_add(T::DbWeight::get().reads(7))
+            .saturating_add(T::DbWeight::get().writes(7))
     }
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
     // Storage: ParachainStaking Round (r:1 w:0)
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1)
     fn schedule_leave_delegators() -> Weight {
-        (50_240_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(20_235_000)
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
     // Storage: ParachainStaking Round (r:1 w:0)
@@ -225,31 +226,32 @@ impl<T: frame_system::Config> pallet_parachain_staking::weights::WeightInfo for
     // Storage: ParachainStaking TopDelegations (r:1 w:1)
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     // Storage: ParachainStaking Total (r:1 w:1)
+    // Storage: ParachainStaking AutoCompoundingDelegations (r:1 w:0)
     // Storage: Balances Locks (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn execute_leave_delegators(x: u32) -> Weight {
-        (0 as Weight)
-            // Standard Error: 147_000
-            .saturating_add((50_946_000 as Weight).saturating_mul(x as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(x as Weight)))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(x as Weight)))
+        Weight::from_ref_time(21_429_000)
+            // Standard Error: 14_000
+            .saturating_add(Weight::from_ref_time(13_765_000).saturating_mul(x.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(x.into())))
+            .saturating_add(T::DbWeight::get().writes(2))
+            .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(x.into())))
     }
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1)
     fn cancel_leave_delegators() -> Weight {
-        (51_670_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(20_711_000)
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1)
     // Storage: ParachainStaking Round (r:1 w:0)
     fn schedule_revoke_delegation() -> Weight {
-        (57_460_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(21_082_000)
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:0)
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
@@ -260,31 +262,32 @@ impl<T: frame_system::Config> pallet_parachain_staking::weights::WeightInfo for
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     // Storage: ParachainStaking Total (r:1 w:1)
     fn delegator_bond_more() -> Weight {
-        (99_120_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(8 as Weight))
-            .saturating_add(T::DbWeight::get().writes(7 as Weight))
+        Weight::from_ref_time(45_308_000)
+            .saturating_add(T::DbWeight::get().reads(8))
+            .saturating_add(T::DbWeight::get().writes(7))
     }
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1)
     // Storage: ParachainStaking Round (r:1 w:0)
     fn schedule_delegator_bond_less() -> Weight {
-        (59_450_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(20_867_000)
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1)
     // Storage: ParachainStaking Round (r:1 w:0)
     // Storage: Balances Locks (r:1 w:1)
     // Storage: System Account (r:1 w:1)
+    // Storage: ParachainStaking AutoCompoundingDelegations (r:1 w:0)
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     // Storage: ParachainStaking TopDelegations (r:1 w:1)
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     // Storage: ParachainStaking Total (r:1 w:1)
     fn execute_revoke_delegation() -> Weight {
-        (120_970_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(9 as Weight))
-            .saturating_add(T::DbWeight::get().writes(8 as Weight))
+        Weight::from_ref_time(61_324_000)
+            .saturating_add(T::DbWeight::get().reads(10))
+            .saturating_add(T::DbWeight::get().writes(8))
     }
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1)
@@ -296,23 +299,23 @@ impl<T: frame_system::Config> pallet_parachain_staking::weights::WeightInfo for
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     // Storage: ParachainStaking Total (r:1 w:1)
     fn execute_delegator_bond_less() -> Weight {
-        (110_711_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(9 as Weight))
-            .saturating_add(T::DbWeight::get().writes(8 as Weight))
+        Weight::from_ref_time(52_704_000)
+            .saturating_add(T::DbWeight::get().reads(9))
+            .saturating_add(T::DbWeight::get().writes(8))
     }
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1)
     fn cancel_revoke_delegation() -> Weight {
-        (43_980_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(20_414_000)
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1)
     fn cancel_delegator_bond_less() -> Weight {
-        (52_200_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(25_884_000)
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: ParachainStaking Round (r:1 w:1)
     // Storage: ParachainStaking Points (r:1 w:0)
@@ -326,18 +329,19 @@ impl<T: frame_system::Config> pallet_parachain_staking::weights::WeightInfo for
     // Storage: ParachainStaking CandidateInfo (r:9 w:0)
     // Storage: ParachainStaking DelegationScheduledRequests (r:9 w:0)
     // Storage: ParachainStaking TopDelegations (r:9 w:0)
+    // Storage: ParachainStaking AutoCompoundingDelegations (r:9 w:0)
     // Storage: ParachainStaking Total (r:1 w:0)
     // Storage: ParachainStaking AwardedPts (r:2 w:1)
     // Storage: ParachainStaking AtStake (r:1 w:10)
     // Storage: ParachainStaking SelectedCandidates (r:0 w:1)
     // Storage: ParachainStaking DelayedPayouts (r:0 w:1)
     fn round_transition_on_initialize(x: u32, y: u32) -> Weight {
-        (0 as Weight)
-            // Standard Error: 1_511_000
-            .saturating_add((90_015_000 as Weight).saturating_mul(x as Weight))
-            // Standard Error: 5_000
-            .saturating_add((550_000 as Weight).saturating_mul(y as Weight))
-            .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(x as Weight)))
+        Weight::from_ref_time(0)
+            // Standard Error: 644_000
+            .saturating_add(Weight::from_ref_time(23_725_000).saturating_mul(x.into()))
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(158_000).saturating_mul(y.into()))
+            .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(x.into())))
     }
     // Storage: ParachainStaking DelayedPayouts (r:1 w:0)
     // Storage: ParachainStaking Points (r:1 w:0)
@@ -345,16 +349,45 @@ impl<T: frame_system::Config> pallet_parachain_staking::weights::WeightInfo for
     // Storage: ParachainStaking AtStake (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn pay_one_collator_reward(y: u32) -> Weight {
-        (8_729_000 as Weight)
-            // Standard Error: 53_000
-            .saturating_add((24_974_000 as Weight).saturating_mul(y as Weight))
-            .saturating_add(T::DbWeight::get().reads(6 as Weight))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(y as Weight)))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(y as Weight)))
+        Weight::from_ref_time(42_666_000)
+            // Standard Error: 4_000
+            .saturating_add(Weight::from_ref_time(7_581_000).saturating_mul(y.into()))
+            .saturating_add(T::DbWeight::get().reads(6))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(y.into())))
+            .saturating_add(T::DbWeight::get().writes(3))
+            .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(y.into())))
     }
     // Storage: ParachainStaking Round (r:1 w:0)
     fn base_on_initialize() -> Weight {
-        (7_010_000 as Weight).saturating_add(T::DbWeight::get().reads(1 as Weight))
+        Weight::from_ref_time(5_230_000).saturating_add(T::DbWeight::get().reads(1))
+    }
+    // Storage: ParachainStaking DelegatorState (r:1 w:0)
+    // Storage: ParachainStaking AutoCompoundingDelegations (r:1 w:1)
+    fn set_auto_compound(x: u32, y: u32) -> Weight {
+        Weight::from_ref_time(41_348_000)
+            // Standard Error: 3_000
+            .saturating_add(Weight::from_ref_time(123_000).saturating_mul(x.into()))
+            // Standard Error: 9_000
+            .saturating_add(Weight::from_ref_time(129_000).saturating_mul(y.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(1))
+    }
+    // Storage: System Account (r:1 w:1)
+    // Storage: ParachainStaking DelegatorState (r:1 w:1)
+    // Storage: ParachainStaking CandidateInfo (r:1 w:1)
+    // Storage: ParachainStaking AutoCompoundingDelegations (r:1 w:1)
+    // Storage: ParachainStaking TopDelegations (r:1 w:1)
+    // Storage: ParachainStaking CandidatePool (r:1 w:1)
+    // Storage: Balances Locks (r:1 w:1)
+    // Storage: ParachainStaking Total (r:1 w:1)
+    // Storage: ParachainStaking BottomDelegations (r:1 w:1)
+    fn delegate_with_auto_compound(x: u32, y: u32, _z: u32) -> Weight {
+        Weight::from_ref_time(98_391_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(40_000).saturating_mul(x.into()))
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(39_000).saturating_mul(y.into()))
+            .saturating_add(T::DbWeight::get().reads(8))
+            .saturating_add(T::DbWeight::get().writes(8))
     }
 }
diff --git a/runtime/common/src/weights/pallet_preimage.rs b/runtime/common/src/weights/pallet_preimage.rs
index 5f5bbd4c2..2c9a555ce 100644
--- a/runtime/common/src/weights/pallet_preimage.rs
+++ b/runtime/common/src/weights/pallet_preimage.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_preimage
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -51,86 +51,86 @@ impl<T: frame_system::Config> pallet_preimage::weights::WeightInfo for WeightInf
     // Storage: Preimage PreimageFor (r:1 w:1)
     // Storage: Preimage StatusFor (r:1 w:1)
     fn note_preimage(s: u32) -> Weight {
-        (0 as Weight)
+        Weight::from_ref_time(0)
             // Standard Error: 0
-            .saturating_add((3_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+            .saturating_add(Weight::from_ref_time(1_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Preimage PreimageFor (r:1 w:1)
     // Storage: Preimage StatusFor (r:1 w:0)
     fn note_requested_preimage(s: u32) -> Weight {
-        (0 as Weight)
+        Weight::from_ref_time(0)
             // Standard Error: 0
-            .saturating_add((4_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+            .saturating_add(Weight::from_ref_time(1_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Preimage PreimageFor (r:1 w:1)
     // Storage: Preimage StatusFor (r:1 w:0)
     fn note_no_deposit_preimage(s: u32) -> Weight {
-        (0 as Weight)
+        Weight::from_ref_time(0)
             // Standard Error: 0
-            .saturating_add((4_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+            .saturating_add(Weight::from_ref_time(1_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     // Storage: Preimage PreimageFor (r:0 w:1)
     fn unnote_preimage() -> Weight {
-        (90_241_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(23_817_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     // Storage: Preimage PreimageFor (r:0 w:1)
     fn unnote_no_deposit_preimage() -> Weight {
-        (68_510_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(14_632_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     fn request_preimage() -> Weight {
-        (95_300_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(22_851_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     fn request_no_deposit_preimage() -> Weight {
-        (72_430_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(13_733_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     fn request_unnoted_preimage() -> Weight {
-        (47_350_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(13_220_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     fn request_requested_preimage() -> Weight {
-        (22_100_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(6_833_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     // Storage: Preimage PreimageFor (r:0 w:1)
     fn unrequest_preimage() -> Weight {
-        (66_950_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(15_046_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     // Storage: Preimage PreimageFor (r:0 w:1)
     fn unrequest_unnoted_preimage() -> Weight {
-        (43_790_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(15_443_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     fn unrequest_multi_referenced_preimage() -> Weight {
-        (22_570_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(7_028_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
 }
diff --git a/runtime/common/src/weights/pallet_proxy.rs b/runtime/common/src/weights/pallet_proxy.rs
index 3fa33fea5..55168c709 100644
--- a/runtime/common/src/weights/pallet_proxy.rs
+++ b/runtime/common/src/weights/pallet_proxy.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_proxy
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -50,92 +50,92 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_proxy::weights::WeightInfo for WeightInfo<T> {
     // Storage: Proxy Proxies (r:1 w:0)
     fn proxy(p: u32) -> Weight {
-        (31_661_000 as Weight)
-            // Standard Error: 10_000
-            .saturating_add((224_000 as Weight).saturating_mul(p as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
+        Weight::from_ref_time(14_551_000)
+            // Standard Error: 3_000
+            .saturating_add(Weight::from_ref_time(15_000).saturating_mul(p.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
     }
     // Storage: Proxy Proxies (r:1 w:0)
     // Storage: Proxy Announcements (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn proxy_announced(a: u32, p: u32) -> Weight {
-        (68_434_000 as Weight)
-            // Standard Error: 39_000
-            .saturating_add((265_000 as Weight).saturating_mul(a as Weight))
-            // Standard Error: 41_000
-            .saturating_add((14_000 as Weight).saturating_mul(p as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(27_375_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(64_000).saturating_mul(a.into()))
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(68_000).saturating_mul(p.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Proxy Announcements (r:1 w:1)
     // Storage: System Account (r:1 w:1)
-    fn remove_announcement(a: u32, p: u32) -> Weight {
-        (40_722_000 as Weight)
-            // Standard Error: 9_000
-            .saturating_add((434_000 as Weight).saturating_mul(a as Weight))
-            // Standard Error: 9_000
-            .saturating_add((72_000 as Weight).saturating_mul(p as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+    fn remove_announcement(a: u32, _p: u32) -> Weight {
+        Weight::from_ref_time(20_140_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(88_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Proxy Announcements (r:1 w:1)
     // Storage: System Account (r:1 w:1)
-    fn reject_announcement(a: u32, p: u32) -> Weight {
-        (44_132_000 as Weight)
-            // Standard Error: 33_000
-            .saturating_add((394_000 as Weight).saturating_mul(a as Weight))
-            // Standard Error: 34_000
-            .saturating_add((62_000 as Weight).saturating_mul(p as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+    fn reject_announcement(a: u32, _p: u32) -> Weight {
+        Weight::from_ref_time(20_526_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(70_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Proxy Proxies (r:1 w:0)
     // Storage: Proxy Announcements (r:1 w:1)
     // Storage: System Account (r:1 w:1)
-    fn announce(a: u32, _p: u32) -> Weight {
-        (63_543_000 as Weight)
-            // Standard Error: 40_000
-            .saturating_add((356_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+    fn announce(a: u32, p: u32) -> Weight {
+        Weight::from_ref_time(24_821_000)
+            // Standard Error: 3_000
+            .saturating_add(Weight::from_ref_time(95_000).saturating_mul(a.into()))
+            // Standard Error: 3_000
+            .saturating_add(Weight::from_ref_time(57_000).saturating_mul(p.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Proxy Proxies (r:1 w:1)
     fn add_proxy(p: u32) -> Weight {
-        (51_619_000 as Weight)
-            // Standard Error: 15_000
-            .saturating_add((233_000 as Weight).saturating_mul(p as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(20_093_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(70_000).saturating_mul(p.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Proxy Proxies (r:1 w:1)
     fn remove_proxy(p: u32) -> Weight {
-        (52_529_000 as Weight)
-            // Standard Error: 9_000
-            .saturating_add((212_000 as Weight).saturating_mul(p as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(20_379_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(64_000).saturating_mul(p.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Proxy Proxies (r:1 w:1)
     fn remove_proxies(p: u32) -> Weight {
-        (44_494_000 as Weight)
-            // Standard Error: 4_000
-            .saturating_add((154_000 as Weight).saturating_mul(p as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(17_624_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(35_000).saturating_mul(p.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
     // Storage: Proxy Proxies (r:1 w:1)
-    fn anonymous(_p: u32) -> Weight {
-        (60_255_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+    fn anonymous(p: u32) -> Weight {
+        Weight::from_ref_time(22_081_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(11_000).saturating_mul(p.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Proxy Proxies (r:1 w:1)
     fn kill_anonymous(p: u32) -> Weight {
-        (44_307_000 as Weight)
-            // Standard Error: 69_000
-            .saturating_add((257_000 as Weight).saturating_mul(p as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(18_300_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(41_000).saturating_mul(p.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
 }
diff --git a/runtime/common/src/weights/pallet_scheduler.rs b/runtime/common/src/weights/pallet_scheduler.rs
index ab4c7bf06..1c4861a84 100644
--- a/runtime/common/src/weights/pallet_scheduler.rs
+++ b/runtime/common/src/weights/pallet_scheduler.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_scheduler
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -53,143 +53,145 @@ impl<T: frame_system::Config> pallet_scheduler::weights::WeightInfo for WeightIn
     // Storage: Preimage StatusFor (r:1 w:1)
     // Storage: Scheduler Lookup (r:0 w:1)
     fn on_initialize_periodic_named_resolved(s: u32) -> Weight {
-        (15_878_000 as Weight)
-            // Standard Error: 544_000
-            .saturating_add((41_862_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(s as Weight)))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(s as Weight)))
+        Weight::from_ref_time(21_157_000)
+            // Standard Error: 18_000
+            .saturating_add(Weight::from_ref_time(12_140_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(s.into())))
+            .saturating_add(T::DbWeight::get().writes(1))
+            .saturating_add(T::DbWeight::get().writes((4_u64).saturating_mul(s.into())))
     }
     // Storage: Scheduler Agenda (r:1 w:1)
     // Storage: Preimage PreimageFor (r:1 w:1)
     // Storage: Preimage StatusFor (r:1 w:1)
     // Storage: Scheduler Lookup (r:0 w:1)
     fn on_initialize_named_resolved(s: u32) -> Weight {
-        (10_252_000 as Weight)
-            // Standard Error: 440_000
-            .saturating_add((32_954_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight)))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(s as Weight)))
+        Weight::from_ref_time(19_942_000)
+            // Standard Error: 17_000
+            .saturating_add(Weight::from_ref_time(9_690_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(s.into())))
+            .saturating_add(T::DbWeight::get().writes(1))
+            .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(s.into())))
     }
     // Storage: Scheduler Agenda (r:2 w:2)
     // Storage: Preimage PreimageFor (r:1 w:1)
     // Storage: Preimage StatusFor (r:1 w:1)
     fn on_initialize_periodic_resolved(s: u32) -> Weight {
-        (7_473_000 as Weight)
-            // Standard Error: 161_000
-            .saturating_add((35_361_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(s as Weight)))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(s as Weight)))
+        Weight::from_ref_time(20_565_000)
+            // Standard Error: 21_000
+            .saturating_add(Weight::from_ref_time(10_251_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(s.into())))
+            .saturating_add(T::DbWeight::get().writes(1))
+            .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(s.into())))
     }
     // Storage: Scheduler Agenda (r:1 w:1)
     // Storage: Preimage PreimageFor (r:1 w:1)
     // Storage: Preimage StatusFor (r:1 w:1)
     fn on_initialize_resolved(s: u32) -> Weight {
-        (0 as Weight)
-            // Standard Error: 156_000
-            .saturating_add((29_887_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight)))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(s as Weight)))
+        Weight::from_ref_time(18_489_000)
+            // Standard Error: 22_000
+            .saturating_add(Weight::from_ref_time(8_916_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(s.into())))
+            .saturating_add(T::DbWeight::get().writes(1))
+            .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(s.into())))
     }
     // Storage: Scheduler Agenda (r:2 w:2)
     // Storage: Preimage PreimageFor (r:1 w:0)
     // Storage: Scheduler Lookup (r:0 w:1)
     fn on_initialize_named_aborted(s: u32) -> Weight {
-        (26_628_000 as Weight)
-            // Standard Error: 60_000
-            .saturating_add((11_243_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+        Weight::from_ref_time(7_774_000)
+            // Standard Error: 6_000
+            .saturating_add(Weight::from_ref_time(3_371_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into())))
+            .saturating_add(T::DbWeight::get().writes(2))
+            .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
     }
     // Storage: Scheduler Agenda (r:2 w:2)
     // Storage: Preimage PreimageFor (r:1 w:0)
     fn on_initialize_aborted(s: u32) -> Weight {
-        (29_715_000 as Weight)
-            // Standard Error: 81_000
-            .saturating_add((6_070_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(6_944_000)
+            // Standard Error: 3_000
+            .saturating_add(Weight::from_ref_time(1_744_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into())))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Scheduler Agenda (r:2 w:2)
     // Storage: Scheduler Lookup (r:0 w:1)
     fn on_initialize_periodic_named(s: u32) -> Weight {
-        (20_565_000 as Weight)
-            // Standard Error: 40_000
-            .saturating_add((20_118_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(s as Weight)))
+        Weight::from_ref_time(18_393_000)
+            // Standard Error: 20_000
+            .saturating_add(Weight::from_ref_time(5_858_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into())))
+            .saturating_add(T::DbWeight::get().writes(1))
+            .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(s.into())))
     }
     // Storage: Scheduler Agenda (r:2 w:2)
     fn on_initialize_periodic(s: u32) -> Weight {
-        (51_399_000 as Weight)
-            // Standard Error: 127_000
-            .saturating_add((14_763_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+        Weight::from_ref_time(12_837_000)
+            // Standard Error: 8_000
+            .saturating_add(Weight::from_ref_time(4_375_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into())))
+            .saturating_add(T::DbWeight::get().writes(1))
+            .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
     }
     // Storage: Scheduler Agenda (r:1 w:1)
     // Storage: Scheduler Lookup (r:0 w:1)
     fn on_initialize_named(s: u32) -> Weight {
-        (33_895_000 as Weight)
-            // Standard Error: 57_000
-            .saturating_add((11_791_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+        Weight::from_ref_time(12_809_000)
+            // Standard Error: 10_000
+            .saturating_add(Weight::from_ref_time(3_790_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
+            .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
     }
     // Storage: Scheduler Agenda (r:1 w:1)
     fn on_initialize(s: u32) -> Weight {
-        (41_957_000 as Weight)
-            // Standard Error: 109_000
-            .saturating_add((9_825_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(10_524_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(3_133_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Scheduler Agenda (r:1 w:1)
     fn schedule(s: u32) -> Weight {
-        (36_388_000 as Weight)
-            // Standard Error: 6_000
-            .saturating_add((148_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(13_078_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(91_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Scheduler Agenda (r:1 w:1)
     // Storage: Scheduler Lookup (r:0 w:1)
     fn cancel(s: u32) -> Weight {
-        (37_514_000 as Weight)
-            // Standard Error: 7_000
-            .saturating_add((1_101_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(13_377_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(392_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Scheduler Lookup (r:1 w:1)
     // Storage: Scheduler Agenda (r:1 w:1)
-    fn schedule_named(_s: u32) -> Weight {
-        (48_375_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+    fn schedule_named(s: u32) -> Weight {
+        Weight::from_ref_time(15_612_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(143_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Scheduler Lookup (r:1 w:1)
     // Storage: Scheduler Agenda (r:1 w:1)
     fn cancel_named(s: u32) -> Weight {
-        (38_182_000 as Weight)
-            // Standard Error: 11_000
-            .saturating_add((1_045_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(15_559_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(434_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
 }
diff --git a/runtime/common/src/weights/pallet_timestamp.rs b/runtime/common/src/weights/pallet_timestamp.rs
index a94214901..badebae73 100644
--- a/runtime/common/src/weights/pallet_timestamp.rs
+++ b/runtime/common/src/weights/pallet_timestamp.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_timestamp
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -49,13 +49,12 @@ use frame_support::{
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_timestamp::weights::WeightInfo for WeightInfo<T> {
     // Storage: Timestamp Now (r:1 w:1)
-    // Storage: Aura CurrentSlot (r:1 w:0)
     fn set() -> Weight {
-        (19_010_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(5_328_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     fn on_finalize() -> Weight {
-        (5_500_000 as Weight)
+        Weight::from_ref_time(3_459_000)
     }
 }
diff --git a/runtime/common/src/weights/pallet_treasury.rs b/runtime/common/src/weights/pallet_treasury.rs
index 3e646321b..dcdf176e0 100644
--- a/runtime/common/src/weights/pallet_treasury.rs
+++ b/runtime/common/src/weights/pallet_treasury.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_treasury
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -49,47 +49,47 @@ use frame_support::{
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_treasury::weights::WeightInfo for WeightInfo<T> {
     fn spend() -> Weight {
-        (290_000 as Weight)
+        Weight::from_ref_time(97_000)
     }
     // Storage: Treasury ProposalCount (r:1 w:1)
     // Storage: Treasury Proposals (r:0 w:1)
     fn propose_spend() -> Weight {
-        (46_190_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(20_639_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Treasury Proposals (r:1 w:1)
     fn reject_proposal() -> Weight {
-        (58_530_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(24_734_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Treasury Proposals (r:1 w:0)
     // Storage: Treasury Approvals (r:1 w:1)
     fn approve_proposal(p: u32) -> Weight {
-        (22_156_000 as Weight)
-            // Standard Error: 7_000
-            .saturating_add((300_000 as Weight).saturating_mul(p as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(10_189_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(108_000).saturating_mul(p.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Treasury Approvals (r:1 w:1)
     fn remove_approval() -> Weight {
-        (13_870_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(6_149_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: System Account (r:1 w:1)
     // Storage: Treasury Approvals (r:1 w:1)
     // Storage: Bounties BountyApprovals (r:1 w:1)
     // Storage: Treasury Proposals (r:2 w:2)
     fn on_initialize_proposals(p: u32) -> Weight {
-        (106_923_000 as Weight)
-            // Standard Error: 370_000
-            .saturating_add((56_357_000 as Weight).saturating_mul(p as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight)))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(p as Weight)))
+        Weight::from_ref_time(39_798_000)
+            // Standard Error: 30_000
+            .saturating_add(Weight::from_ref_time(17_861_000).saturating_mul(p.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(p.into())))
+            .saturating_add(T::DbWeight::get().writes(2))
+            .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(p.into())))
     }
 }
diff --git a/runtime/common/src/weights/pallet_utility.rs b/runtime/common/src/weights/pallet_utility.rs
index dc64b168a..07713136c 100644
--- a/runtime/common/src/weights/pallet_utility.rs
+++ b/runtime/common/src/weights/pallet_utility.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_utility
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -49,24 +49,24 @@ use frame_support::{
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_utility::weights::WeightInfo for WeightInfo<T> {
     fn batch(c: u32) -> Weight {
-        (40_987_000 as Weight)
-            // Standard Error: 18_000
-            .saturating_add((5_614_000 as Weight).saturating_mul(c as Weight))
+        Weight::from_ref_time(31_929_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(2_285_000).saturating_mul(c.into()))
     }
     fn as_derivative() -> Weight {
-        (8_160_000 as Weight)
+        Weight::from_ref_time(3_956_000)
     }
     fn batch_all(c: u32) -> Weight {
-        (89_220_000 as Weight)
-            // Standard Error: 52_000
-            .saturating_add((5_803_000 as Weight).saturating_mul(c as Weight))
+        Weight::from_ref_time(35_456_000)
+            // Standard Error: 3_000
+            .saturating_add(Weight::from_ref_time(2_327_000).saturating_mul(c.into()))
     }
     fn dispatch_as() -> Weight {
-        (24_700_000 as Weight)
+        Weight::from_ref_time(9_192_000)
     }
     fn force_batch(c: u32) -> Weight {
-        (69_293_000 as Weight)
-            // Standard Error: 46_000
-            .saturating_add((5_611_000 as Weight).saturating_mul(c as Weight))
+        Weight::from_ref_time(32_930_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(2_283_000).saturating_mul(c.into()))
     }
 }
diff --git a/runtime/common/src/weights/pallet_vesting.rs b/runtime/common/src/weights/pallet_vesting.rs
index df746fda3..c0d0f370e 100644
--- a/runtime/common/src/weights/pallet_vesting.rs
+++ b/runtime/common/src/weights/pallet_vesting.rs
@@ -18,16 +18,16 @@
 //! Autogenerated weights for pallet_vesting
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-01-05, STEPS: `2`, REPEAT: 2, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/zeitgeist
+// ./target/release/zeitgeist
 // benchmark
 // pallet
 // --chain=dev
-// --steps=50
-// --repeat=20
+// --steps=2
+// --repeat=2
 // --pallet=pallet_vesting
 // --extrinsic=*
 // --execution=wasm
@@ -51,89 +51,89 @@ impl<T: frame_system::Config> pallet_vesting::weights::WeightInfo for WeightInfo
     // Storage: Vesting Vesting (r:1 w:1)
     // Storage: Balances Locks (r:1 w:1)
     fn vest_locked(l: u32, s: u32) -> Weight {
-        (64_180_000 as Weight)
-            // Standard Error: 22_000
-            .saturating_add((68_000 as Weight).saturating_mul(l as Weight))
-            // Standard Error: 46_000
-            .saturating_add((202_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(51_010_000)
+            // Standard Error: 92_000
+            .saturating_add(Weight::from_ref_time(81_000).saturating_mul(l.into()))
+            // Standard Error: 167_000
+            .saturating_add(Weight::from_ref_time(98_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Vesting Vesting (r:1 w:1)
     // Storage: Balances Locks (r:1 w:1)
     fn vest_unlocked(l: u32, s: u32) -> Weight {
-        (61_117_000 as Weight)
-            // Standard Error: 21_000
-            .saturating_add((77_000 as Weight).saturating_mul(l as Weight))
-            // Standard Error: 43_000
-            .saturating_add((274_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(53_538_000)
+            // Standard Error: 92_000
+            .saturating_add(Weight::from_ref_time(3_000).saturating_mul(l.into()))
+            // Standard Error: 167_000
+            .saturating_add(Weight::from_ref_time(90_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Vesting Vesting (r:1 w:1)
     // Storage: Balances Locks (r:1 w:1)
     // Storage: System Account (r:1 w:1)
-    fn vest_other_locked(l: u32, _s: u32) -> Weight {
-        (71_338_000 as Weight)
-            // Standard Error: 21_000
-            .saturating_add((99_000 as Weight).saturating_mul(l as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+    fn vest_other_locked(l: u32, s: u32) -> Weight {
+        Weight::from_ref_time(48_450_000)
+            // Standard Error: 90_000
+            .saturating_add(Weight::from_ref_time(111_000).saturating_mul(l.into()))
+            // Standard Error: 164_000
+            .saturating_add(Weight::from_ref_time(198_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: Vesting Vesting (r:1 w:1)
     // Storage: Balances Locks (r:1 w:1)
     // Storage: System Account (r:1 w:1)
-    fn vest_other_unlocked(_l: u32, s: u32) -> Weight {
-        (62_952_000 as Weight)
-            // Standard Error: 65_000
-            .saturating_add((500_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+    fn vest_other_unlocked(l: u32, s: u32) -> Weight {
+        Weight::from_ref_time(53_097_000)
+            // Standard Error: 85_000
+            .saturating_add(Weight::from_ref_time(31_000).saturating_mul(l.into()))
+            // Standard Error: 154_000
+            .saturating_add(Weight::from_ref_time(39_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: Vesting Vesting (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     // Storage: Balances Locks (r:1 w:1)
-    fn vested_transfer(l: u32, s: u32) -> Weight {
-        (79_913_000 as Weight)
-            // Standard Error: 24_000
-            .saturating_add((206_000 as Weight).saturating_mul(l as Weight))
-            // Standard Error: 49_000
-            .saturating_add((535_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+    fn vested_transfer(l: u32, _s: u32) -> Weight {
+        Weight::from_ref_time(81_504_000)
+            // Standard Error: 115_000
+            .saturating_add(Weight::from_ref_time(65_000).saturating_mul(l.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: Vesting Vesting (r:1 w:1)
     // Storage: System Account (r:2 w:2)
     // Storage: Balances Locks (r:1 w:1)
-    fn force_vested_transfer(l: u32, s: u32) -> Weight {
-        (78_857_000 as Weight)
-            // Standard Error: 67_000
-            .saturating_add((223_000 as Weight).saturating_mul(l as Weight))
-            // Standard Error: 137_000
-            .saturating_add((808_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(4 as Weight))
+    fn force_vested_transfer(l: u32, _s: u32) -> Weight {
+        Weight::from_ref_time(81_219_000)
+            // Standard Error: 106_000
+            .saturating_add(Weight::from_ref_time(47_000).saturating_mul(l.into()))
+            .saturating_add(T::DbWeight::get().reads(4))
+            .saturating_add(T::DbWeight::get().writes(4))
     }
     // Storage: Vesting Vesting (r:1 w:1)
     // Storage: Balances Locks (r:1 w:1)
     fn not_unlocking_merge_schedules(l: u32, s: u32) -> Weight {
-        (59_290_000 as Weight)
-            // Standard Error: 25_000
-            .saturating_add((249_000 as Weight).saturating_mul(l as Weight))
-            // Standard Error: 54_000
-            .saturating_add((207_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(53_564_000)
+            // Standard Error: 72_000
+            .saturating_add(Weight::from_ref_time(88_000).saturating_mul(l.into()))
+            // Standard Error: 137_000
+            .saturating_add(Weight::from_ref_time(64_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: Vesting Vesting (r:1 w:1)
     // Storage: Balances Locks (r:1 w:1)
     fn unlocking_merge_schedules(l: u32, s: u32) -> Weight {
-        (50_783_000 as Weight)
-            // Standard Error: 20_000
-            .saturating_add((247_000 as Weight).saturating_mul(l as Weight))
-            // Standard Error: 43_000
-            .saturating_add((584_000 as Weight).saturating_mul(s as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(53_580_000)
+            // Standard Error: 91_000
+            .saturating_add(Weight::from_ref_time(50_000).saturating_mul(l.into()))
+            // Standard Error: 171_000
+            .saturating_add(Weight::from_ref_time(69_000).saturating_mul(s.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
 }
diff --git a/runtime/zeitgeist/Cargo.toml b/runtime/zeitgeist/Cargo.toml
index d1d3f8fb5..08e48ffea 100644
--- a/runtime/zeitgeist/Cargo.toml
+++ b/runtime/zeitgeist/Cargo.toml
@@ -1,82 +1,85 @@
 [build-dependencies]
-substrate-wasm-builder = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
+substrate-wasm-builder = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
 
 [dependencies]
-frame-executive = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system-rpc-runtime-api = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-orml-benchmarking = { branch = "polkadot-v0.9.26", default-features = false, optional = true, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
-orml-currencies = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
-orml-tokens = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
-orml-traits = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
-pallet-balances = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-bounties = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-collective = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-democracy = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-identity = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-membership = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-multisig = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-preimage = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-proxy = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-randomness-collective-flip = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-scheduler = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-timestamp = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-transaction-payment = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-transaction-payment-rpc-runtime-api = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-treasury = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-utility = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-vesting = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+frame-executive = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+frame-system-rpc-runtime-api = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+orml-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
+orml-currencies = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
+orml-tokens = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
+orml-traits = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
+pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-bounties = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-collective = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-democracy = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-identity = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-membership = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-multisig = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-preimage = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-proxy = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-randomness-collective-flip = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-scheduler = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-transaction-payment = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-transaction-payment-rpc-runtime-api = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-treasury = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-utility = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-vesting = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-sp-api = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-block-builder = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-core = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-inherents = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-offchain = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-runtime = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-session = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-transaction-pool = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-version = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-api = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-block-builder = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-core = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-inherents = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-offchain = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-session = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-transaction-pool = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-version = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 substrate-fixed = { default-features = false, features = ["serde"], git = "https://github.com/encointer/substrate-fixed" }
 
 # Try-Runtime
 
-frame-try-runtime = { branch = "polkadot-v0.9.26", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" }
+frame-try-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/substrate" }
 
 # Benchmark
 
-frame-benchmarking = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate", optional = true }
-frame-system-benchmarking = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate", optional = true }
+frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate", optional = true }
+frame-system-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate", optional = true }
 
 # Cumulus
 
-cumulus-pallet-dmp-queue = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-pallet-parachain-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-pallet-xcm = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-pallet-xcmp-queue = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-primitives-core = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-primitives-timestamp = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-primitives-utility = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-parachain-info = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
+cumulus-pallet-dmp-queue = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-pallet-parachain-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-pallet-xcm = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-pallet-xcmp-queue = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-primitives-core = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-primitives-timestamp = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+cumulus-primitives-utility = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true }
+parachain-info = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true }
 
 # Parachain
 
-nimbus-primitives = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
-pallet-author-inherent = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
-pallet-author-mapping = { tag = "v0.26.1", default-features = false, git = "https://github.com/purestake/moonbeam", optional = true }
-pallet-author-slot-filter = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
-pallet-crowdloan-rewards = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/crowdloan-rewards", optional = true }
-pallet-parachain-staking = { tag = "v0.26.1", default-features = false, git = "https://github.com/purestake/moonbeam", optional = true }
-polkadot-parachain = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
-session-keys-primitives = { tag = "v0.26.1", default-features = false, git = "https://github.com/purestake/moonbeam", optional = true }
+nimbus-primitives = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true }
+pallet-author-inherent = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true }
+pallet-author-mapping = { tag = "v0.27.2-a", default-features = false, git = "https://github.com/zeitgeistpm/moonbeam", optional = true }
+pallet-author-slot-filter = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true }
+pallet-crowdloan-rewards = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/crowdloan-rewards", optional = true }
+pallet-parachain-staking = { tag = "v0.27.2-a", default-features = false, git = "https://github.com/zeitgeistpm/moonbeam", optional = true }
+session-keys-primitives = { tag = "v0.27.2-a", default-features = false, git = "https://github.com/zeitgeistpm/moonbeam", optional = true }
+
+# Polkadot
+
+polkadot-parachain = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true }
 
 # Standalone
 
-pallet-aura = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-grandpa = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-consensus-aura = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-finality-grandpa = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-aura = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+pallet-grandpa = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-consensus-aura = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-finality-grandpa = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 
 # Utility
 cfg-if = { version = "1.0.0" }
@@ -84,17 +87,17 @@ hex-literal = { default-features = false, optional = true, version = "0.3.4" }
 log = { version = "0.4.17", default-features = false, optional = true }
 
 # XCM
-kusama-runtime = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
-orml-asset-registry = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true }
-orml-unknown-tokens = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true }
-orml-xcm-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true }
-orml-xtokens = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true }
-pallet-xcm = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
-polkadot-primitives = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
-polkadot-runtime-parachains = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
-xcm = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
-xcm-builder = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
-xcm-executor = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
+kusama-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true }
+orml-asset-registry = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true }
+orml-unknown-tokens = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true }
+orml-xcm-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true }
+orml-xtokens = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true }
+pallet-xcm = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true }
+polkadot-primitives = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true }
+polkadot-runtime-parachains = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true }
+xcm = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true }
+xcm-builder = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true }
+xcm-executor = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true }
 
 # Zeitgeist
 
@@ -113,8 +116,8 @@ zrml-swaps = { default-features = false, path = "../../zrml/swaps" }
 zrml-swaps-runtime-api = { default-features = false, path = "../../zrml/swaps/runtime-api" }
 
 [dev-dependencies]
-sp-io = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-xcm-emulator = { rev = "ab5cd6c5fabe6ddda52ed6803ee1bf54c258fefe", git = "https://github.com/shaunxw/xcm-simulator" }
+sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+xcm-emulator = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/xcm-simulator" }
 
 [features]
 default = ["std"]
@@ -320,6 +323,7 @@ try-runtime = [
     # For every pallet in the runtime include try-runtime
 
     # System runtime pallets
+    "frame-support/try-runtime",
     "frame-system/try-runtime",
     "pallet-timestamp/try-runtime",
     "pallet-randomness-collective-flip/try-runtime",
@@ -364,10 +368,23 @@ try-runtime = [
 
     # Parachain
     "pallet-author-mapping?/try-runtime",
+    "pallet-author-inherent?/try-runtime",
     "pallet-author-slot-filter?/try-runtime",
     "pallet-parachain-staking?/try-runtime",
     # Required by pallet-parachain-staking@v0.26.1
     "parity-scale-codec/full",
+    "pallet-proxy/try-runtime",
+    "pallet-grandpa/try-runtime",
+    "pallet-aura/try-runtime",
+    "pallet-xcm/try-runtime",
+    "pallet-crowdloan-rewards/try-runtime",
+    # Cumulus
+
+    "cumulus-pallet-dmp-queue?/try-runtime",
+    "cumulus-pallet-parachain-system?/try-runtime",
+    "cumulus-pallet-xcm?/try-runtime",
+    "cumulus-pallet-xcmp-queue?/try-runtime",
+    "parachain-info?/try-runtime",
 ]
 with-global-disputes = [
     "zrml-global-disputes",
diff --git a/runtime/zeitgeist/src/integration_tests/xcm/test_net.rs b/runtime/zeitgeist/src/integration_tests/xcm/test_net.rs
index ead4ca132..db07a0ca5 100644
--- a/runtime/zeitgeist/src/integration_tests/xcm/test_net.rs
+++ b/runtime/zeitgeist/src/integration_tests/xcm/test_net.rs
@@ -123,7 +123,7 @@ fn default_parachains_host_configuration() -> HostConfiguration<BlockNumber> {
         max_upward_queue_count: 8,
         max_upward_queue_size: 1024 * 1024,
         max_downward_message_size: 1024,
-        ump_service_total_weight: Weight::from(4 * 1_000_000_000u32),
+        ump_service_total_weight: Weight::from_ref_time(4_u64 * 1_000_000_000_u64),
         max_upward_message_size: 50 * 1024,
         max_upward_message_num_per_candidate: 5,
         hrmp_sender_deposit: 0,
diff --git a/runtime/zeitgeist/src/lib.rs b/runtime/zeitgeist/src/lib.rs
index 3fde212b7..def87361b 100644
--- a/runtime/zeitgeist/src/lib.rs
+++ b/runtime/zeitgeist/src/lib.rs
@@ -33,6 +33,7 @@ pub use frame_system::{
 };
 #[cfg(feature = "parachain")]
 pub use pallet_author_slot_filter::EligibilityValue;
+pub use pallet_balances::Call as BalancesCall;
 
 #[cfg(feature = "parachain")]
 pub use crate::parachain_params::*;
@@ -74,7 +75,7 @@ use sp_runtime::{
 };
 
 #[cfg(feature = "parachain")]
-use nimbus_primitives::{CanAuthor, NimbusId};
+use nimbus_primitives::CanAuthor;
 use sp_version::RuntimeVersion;
 
 #[cfg(test)]
diff --git a/runtime/zeitgeist/src/parachain_params.rs b/runtime/zeitgeist/src/parachain_params.rs
index 3e80d851c..aff4b9e42 100644
--- a/runtime/zeitgeist/src/parachain_params.rs
+++ b/runtime/zeitgeist/src/parachain_params.rs
@@ -49,10 +49,10 @@ parameter_types! {
     pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();
     pub const RelayLocation: MultiLocation = MultiLocation::parent();
     pub const RelayNetwork: NetworkId = NetworkId::Kusama;
-    pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;
-    pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;
+    pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
+    pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
     pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();
-    pub UnitWeightCost: Weight = 200_000_000;
+    pub UnitWeightCost: u64 = 200_000_000;
 
     // Staking
     /// Rounds before the candidate bond increase/decrease can be executed
@@ -90,7 +90,7 @@ parameter_types! {
 
     // XCM
     /// Base weight for XCM execution
-    pub const BaseXcmWeight: Weight = 200_000_000;
+    pub const BaseXcmWeight: u64 = 200_000_000;
     /// The maximum number of distinct assets allowed to be transferred in a
     /// single helper extrinsic.
     pub const MaxAssetsForTransfer: usize = 2;
diff --git a/runtime/zeitgeist/src/parameters.rs b/runtime/zeitgeist/src/parameters.rs
index b4408f876..636105ecc 100644
--- a/runtime/zeitgeist/src/parameters.rs
+++ b/runtime/zeitgeist/src/parameters.rs
@@ -34,7 +34,8 @@ use frame_system::limits::{BlockLength, BlockWeights};
 use orml_traits::parameter_type_with_key;
 use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment};
 use sp_runtime::{
-    traits::AccountIdConversion, FixedPointNumber, Perbill, Percent, Permill, Perquintill,
+    traits::{AccountIdConversion, Bounded},
+    FixedPointNumber, Perbill, Percent, Permill, Perquintill,
 };
 use sp_version::RuntimeVersion;
 use zeitgeist_primitives::{constants::*, types::*};
@@ -43,7 +44,8 @@ use zeitgeist_primitives::{constants::*, types::*};
 use frame_support::traits::LockIdentifier;
 
 pub(crate) const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);
-pub(crate) const MAXIMUM_BLOCK_WEIGHT: Weight = WEIGHT_PER_SECOND / 2;
+pub(crate) const MAXIMUM_BLOCK_WEIGHT: Weight =
+    Weight::from_ref_time(WEIGHT_PER_SECOND.ref_time() / 2);
 pub(crate) const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
 pub(crate) const FEES_AND_TIPS_TREASURY_PERCENTAGE: u32 = 100;
 pub(crate) const FEES_AND_TIPS_BURN_PERCENTAGE: u32 = 0;
@@ -273,9 +275,6 @@ parameter_types! {
     .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)
     .build_or_panic();
 
-    // Timestamp
-    pub const MinimumPeriod: u64 = MILLISECS_PER_BLOCK as u64 / 2;
-
     // Transaction payment
     /// A fee mulitplier for Operational extrinsics to compute “virtual tip”
     /// to boost their priority.
@@ -292,6 +291,12 @@ parameter_types! {
     /// Minimum amount of the multiplier. The test `multiplier_can_grow_from_zero` ensures
     /// that this value is not too low.
     pub MinimumMultiplier: Multiplier = Multiplier::saturating_from_rational(1, 1_000_000u128);
+    /// Maximum amount of the multiplier.
+    pub MaximumMultiplier: Multiplier = Bounded::max_value();
+
+    // Timestamp
+    /// MinimumPeriod for Timestamp
+    pub const MinimumPeriodValue: u64 = MILLISECS_PER_BLOCK as u64 / 2;
 
     // Treasury
     /// Percentage of spare funds (if any) that are burnt per spend period.
@@ -378,5 +383,10 @@ parameter_type_with_key! {
 
 // Parameterized slow adjusting fee updated based on
 // https://research.web3.foundation/en/latest/polkadot/overview/2-token-economics.html#-2.-slow-adjusting-mechanism
-pub type SlowAdjustingFeeUpdate<R> =
-    TargetedFeeAdjustment<R, TargetBlockFullness, AdjustmentVariable, MinimumMultiplier>;
+pub type SlowAdjustingFeeUpdate<R> = TargetedFeeAdjustment<
+    R,
+    TargetBlockFullness,
+    AdjustmentVariable,
+    MinimumMultiplier,
+    MaximumMultiplier,
+>;
diff --git a/runtime/zeitgeist/src/xcm_config/config.rs b/runtime/zeitgeist/src/xcm_config/config.rs
index 8520f5a86..0b1b83b6c 100644
--- a/runtime/zeitgeist/src/xcm_config/config.rs
+++ b/runtime/zeitgeist/src/xcm_config/config.rs
@@ -71,6 +71,7 @@ impl Config for XcmConfig {
     type Barrier = Barrier;
     /// The outer call dispatch type.
     type Call = Call;
+    type CallDispatcher = Call;
     /// Combinations of (Location, Asset) pairs which are trusted as reserves.
     // Trust the parent chain, sibling parachains and children chains of this chain.
     type IsReserve = MultiNativeAsset<AbsoluteReserveProvider>;
diff --git a/runtime/zeitgeist/src/xcm_config/fees.rs b/runtime/zeitgeist/src/xcm_config/fees.rs
index dbedf3d93..bc188eafc 100644
--- a/runtime/zeitgeist/src/xcm_config/fees.rs
+++ b/runtime/zeitgeist/src/xcm_config/fees.rs
@@ -29,8 +29,8 @@ pub fn native_per_second() -> Balance {
 }
 
 pub fn default_per_second(decimals: u32) -> Balance {
-    let base_weight = Balance::from(ExtrinsicBaseWeight::get());
-    let default_per_second = (WEIGHT_PER_SECOND as u128) / base_weight;
+    let base_weight = ExtrinsicBaseWeight::get().ref_time() as u128;
+    let default_per_second = (WEIGHT_PER_SECOND.ref_time() as u128) / base_weight;
     default_per_second * base_fee(decimals)
 }
 
diff --git a/scripts/benchmarks/configuration.sh b/scripts/benchmarks/configuration.sh
index 937f20edd..03a203dac 100644
--- a/scripts/benchmarks/configuration.sh
+++ b/scripts/benchmarks/configuration.sh
@@ -15,7 +15,7 @@ export FRAME_WEIGHT_TEMPLATE="./misc/frame_weight_template.hbs"
 # pallet_crowdloan_rewards benchmark lead to an error within the verify function (deprecated)
 export FRAME_PALLETS_PARACHAIN=( 
                 cumulus_pallet_xcmp_queue \
-                # pallet_author_inherent \
+                pallet_author_inherent \
                 pallet_author_slot_filter \
                 pallet_author_mapping \
                 pallet_parachain_staking \
diff --git a/scripts/benchmarks/quick_check.sh b/scripts/benchmarks/quick_check.sh
index 6794b3895..a5487dcc0 100755
--- a/scripts/benchmarks/quick_check.sh
+++ b/scripts/benchmarks/quick_check.sh
@@ -12,13 +12,13 @@ if [ ! -d "./scripts/benchmarks" ]; then
     exit 1
 fi;
 
-export FRAME_PALLETS_STEPS=1
+export FRAME_PALLETS_STEPS=2
 export FRAME_PALLETS_RUNS=0
 
-export ORML_PALLETS_STEPS=1
+export ORML_PALLETS_STEPS=2
 export ORML_PALLETS_RUNS=0
 
-export ZEITGEIST_PALLETS_STEPS=1
+export ZEITGEIST_PALLETS_STEPS=2
 export ZEITGEIST_PALLETS_RUNS=0
 
 export PROFILE=release
diff --git a/zrml/authorized/Cargo.toml b/zrml/authorized/Cargo.toml
index 45d81459e..7f2098d5f 100644
--- a/zrml/authorized/Cargo.toml
+++ b/zrml/authorized/Cargo.toml
@@ -1,17 +1,17 @@
 [dependencies]
-frame-benchmarking = { branch = "polkadot-v0.9.26", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" }
-frame-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/substrate" }
+frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-sp-runtime = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 zeitgeist-primitives = { default-features = false, path = "../../primitives" }
 zrml-market-commons = { default-features = false, path = "../market-commons" }
 
 [dev-dependencies]
-pallet-balances = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-pallet-timestamp = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-io = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
+pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
 zeitgeist-primitives = { default-features = false, features = ["mock"], path = "../../primitives" }
 
 [features]
diff --git a/zrml/authorized/src/mock.rs b/zrml/authorized/src/mock.rs
index 9b57f0425..49517fc84 100644
--- a/zrml/authorized/src/mock.rs
+++ b/zrml/authorized/src/mock.rs
@@ -91,7 +91,7 @@ impl DisputeResolutionApi for MockResolution {
             Asset<Self::MarketId>,
         >,
     ) -> Result<Weight, DispatchError> {
-        Ok(0)
+        Ok(Weight::zero())
     }
 
     fn add_auto_resolve(
diff --git a/zrml/authorized/src/weights.rs b/zrml/authorized/src/weights.rs
index b2cb712bd..9569f19f7 100644
--- a/zrml/authorized/src/weights.rs
+++ b/zrml/authorized/src/weights.rs
@@ -56,17 +56,18 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: Authorized AuthorizedOutcomeReports (r:1 w:1)
     // Storage: PredictionMarkets MarketIdsPerDisputeBlock (r:1 w:1)
     fn authorize_market_outcome_first_report(m: u32) -> Weight {
-        (31_031_000 as Weight)
+        Weight::from_ref_time(31_031_000)
             // Standard Error: 0
-            .saturating_add((85_000 as Weight).saturating_mul(m as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+            .saturating_add(Weight::from_ref_time(85_000))
+            .saturating_mul(m.into())
+            .saturating_add(T::DbWeight::get().reads(3_u64))
+            .saturating_add(T::DbWeight::get().writes(2_u64))
     }
     // Storage: MarketCommons Markets (r:1 w:0)
     // Storage: Authorized AuthorizedOutcomeReports (r:1 w:1)
     fn authorize_market_outcome_existing_report() -> Weight {
-        (24_000_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(24_000_000)
+            .saturating_add(T::DbWeight::get().reads(2_u64))
+            .saturating_add(T::DbWeight::get().writes(1_u64))
     }
 }
diff --git a/zrml/court/Cargo.toml b/zrml/court/Cargo.toml
index de86174b4..096c6da68 100644
--- a/zrml/court/Cargo.toml
+++ b/zrml/court/Cargo.toml
@@ -1,20 +1,20 @@
 [dependencies]
 arrayvec = { default-features = false, version = "0.7" }
-frame-benchmarking = { branch = "polkadot-v0.9.26", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" }
-frame-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/substrate" }
+frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" }
 rand = { default-features = false, features = ["alloc", "std_rng"], version = "0.8" }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-sp-runtime = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 zeitgeist-primitives = { default-features = false, path = "../../primitives" }
 zrml-market-commons = { default-features = false, path = "../market-commons" }
 
 [dev-dependencies]
-pallet-balances = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-pallet-randomness-collective-flip = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-pallet-timestamp = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-io = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
+pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+pallet-randomness-collective-flip = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
 zeitgeist-primitives = { default-features = false, features = ["mock"], path = "../../primitives" }
 
 [features]
diff --git a/zrml/court/src/mock.rs b/zrml/court/src/mock.rs
index 42622b9a0..fd33e1859 100644
--- a/zrml/court/src/mock.rs
+++ b/zrml/court/src/mock.rs
@@ -87,7 +87,7 @@ impl DisputeResolutionApi for NoopResolution {
             Asset<Self::MarketId>,
         >,
     ) -> Result<Weight, DispatchError> {
-        Ok(0)
+        Ok(Weight::zero())
     }
 
     fn add_auto_resolve(
diff --git a/zrml/court/src/weights.rs b/zrml/court/src/weights.rs
index 0989647b2..b2d139d26 100644
--- a/zrml/court/src/weights.rs
+++ b/zrml/court/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for zrml_court
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -59,23 +59,23 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: Court RequestedJurors (r:1 w:0)
     // Storage: Court Votes (r:1 w:0)
     fn exit_court() -> Weight {
-        (78_840_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(5 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(32_139_000)
+            .saturating_add(T::DbWeight::get().reads(5))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: Court Jurors (r:1 w:1)
     // Storage: Court CounterForJurors (r:1 w:1)
     // Storage: Balances Reserves (r:1 w:1)
     fn join_court() -> Weight {
-        (56_951_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(22_962_000)
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: Court Jurors (r:1 w:0)
     // Storage: Court Votes (r:0 w:1)
     fn vote() -> Weight {
-        (18_980_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(9_773_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
 }
diff --git a/zrml/global-disputes/Cargo.toml b/zrml/global-disputes/Cargo.toml
index a099ee134..dde21457d 100644
--- a/zrml/global-disputes/Cargo.toml
+++ b/zrml/global-disputes/Cargo.toml
@@ -1,11 +1,11 @@
 [dependencies]
-frame-benchmarking = { branch = "polkadot-v0.9.26", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" }
-frame-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/substrate" }
+frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-sp-runtime = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-std = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-std = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 zeitgeist-primitives = { default-features = false, path = "../../primitives" }
 zrml-market-commons = { default-features = false, path = "../market-commons" }
 
@@ -14,9 +14,9 @@ num-traits = { version = "0.2.15", default-features = false, optional = true }
 
 
 [dev-dependencies]
-pallet-balances = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-pallet-timestamp = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-io = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
+pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
 zeitgeist-primitives = { default-features = false, features = ["mock"], path = "../../primitives" }
 
 test-case = "2.0.2"
diff --git a/zrml/global-disputes/src/weights.rs b/zrml/global-disputes/src/weights.rs
index a549c252f..d87225ebd 100644
--- a/zrml/global-disputes/src/weights.rs
+++ b/zrml/global-disputes/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for zrml_global_disputes
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -61,81 +61,81 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: GlobalDisputes Outcomes (r:1 w:1)
     // Storage: GlobalDisputes Locks (r:1 w:1)
     // Storage: Balances Locks (r:1 w:1)
-    fn vote_on_outcome(o: u32, v: u32) -> Weight {
-        (77_234_000 as Weight)
-            // Standard Error: 4_000
-            .saturating_add((122_000 as Weight).saturating_mul(o as Weight))
+    fn vote_on_outcome(_o: u32, v: u32) -> Weight {
+        Weight::from_ref_time(32_621_000)
             // Standard Error: 0
-            .saturating_add((108_000 as Weight).saturating_mul(v as Weight))
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(4 as Weight))
+            .saturating_add(Weight::from_ref_time(37_000).saturating_mul(v.into()))
+            .saturating_add(T::DbWeight::get().reads(4))
+            .saturating_add(T::DbWeight::get().writes(4))
     }
     // Storage: GlobalDisputes Locks (r:1 w:1)
     // Storage: Balances Locks (r:1 w:1)
     // Storage: System Account (r:1 w:0)
     // Storage: GlobalDisputes Winners (r:5 w:0)
     fn unlock_vote_balance_set(l: u32, o: u32) -> Weight {
-        (21_110_000 as Weight)
-            // Standard Error: 3_000
-            .saturating_add((6_327_000 as Weight).saturating_mul(l as Weight))
-            // Standard Error: 20_000
-            .saturating_add((1_976_000 as Weight).saturating_mul(o as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(l as Weight)))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(17_375_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(1_536_000).saturating_mul(l.into()))
+            // Standard Error: 4_000
+            .saturating_add(Weight::from_ref_time(432_000).saturating_mul(o.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(l.into())))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: GlobalDisputes Locks (r:1 w:1)
     // Storage: Balances Locks (r:1 w:1)
     // Storage: System Account (r:1 w:0)
     // Storage: GlobalDisputes Winners (r:5 w:0)
     fn unlock_vote_balance_remove(l: u32, o: u32) -> Weight {
-        (18_940_000 as Weight)
+        Weight::from_ref_time(16_626_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(1_481_000).saturating_mul(l.into()))
             // Standard Error: 3_000
-            .saturating_add((6_247_000 as Weight).saturating_mul(l as Weight))
-            // Standard Error: 19_000
-            .saturating_add((1_822_000 as Weight).saturating_mul(o as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(l as Weight)))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+            .saturating_add(Weight::from_ref_time(326_000).saturating_mul(o.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(l.into())))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: GlobalDisputes Winners (r:1 w:1)
     // Storage: GlobalDisputes Outcomes (r:1 w:1)
     // Storage: System Account (r:1 w:1)
-    fn add_vote_outcome(_w: u32) -> Weight {
-        (91_053_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+    fn add_vote_outcome(w: u32) -> Weight {
+        Weight::from_ref_time(34_491_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(10_000).saturating_mul(w.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: GlobalDisputes Outcomes (r:1 w:0)
     // Storage: GlobalDisputes Winners (r:1 w:0)
     // Storage: System Account (r:2 w:2)
     fn reward_outcome_owner_with_funds(o: u32) -> Weight {
-        (51_857_000 as Weight)
-            // Standard Error: 27_000
-            .saturating_add((33_805_000 as Weight).saturating_mul(o as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(o as Weight)))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(o as Weight)))
+        Weight::from_ref_time(24_336_000)
+            // Standard Error: 13_000
+            .saturating_add(Weight::from_ref_time(11_655_000).saturating_mul(o.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(o.into())))
+            .saturating_add(T::DbWeight::get().writes(1))
+            .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(o.into())))
     }
     // Storage: GlobalDisputes Outcomes (r:1 w:0)
     // Storage: GlobalDisputes Winners (r:1 w:0)
     // Storage: System Account (r:1 w:0)
     fn reward_outcome_owner_no_funds(o: u32) -> Weight {
-        (39_929_000 as Weight)
-            // Standard Error: 3_000
-            .saturating_add((13_000 as Weight).saturating_mul(o as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
+        Weight::from_ref_time(16_681_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(15_000).saturating_mul(o.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
     }
     // Storage: GlobalDisputes Winners (r:1 w:1)
     // Storage: GlobalDisputes Outcomes (r:3 w:2)
     fn purge_outcomes(k: u32, _o: u32) -> Weight {
-        (0 as Weight)
-            // Standard Error: 11_000
-            .saturating_add((23_452_000 as Weight).saturating_mul(k as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
+        Weight::from_ref_time(72_588_000)
+            // Standard Error: 3_000
+            .saturating_add(Weight::from_ref_time(6_944_000).saturating_mul(k.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(k.into())))
+            .saturating_add(T::DbWeight::get().writes(2))
+            .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(k.into())))
     }
 }
diff --git a/zrml/liquidity-mining/Cargo.toml b/zrml/liquidity-mining/Cargo.toml
index 7204827f4..7559a5db9 100644
--- a/zrml/liquidity-mining/Cargo.toml
+++ b/zrml/liquidity-mining/Cargo.toml
@@ -1,18 +1,18 @@
 [dependencies]
-frame-benchmarking = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate", optional = true }
-frame-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate", optional = true }
+frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-serde = { default-features = false, optional = true, version = "1.0.137" }
-sp-runtime = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+serde = { default-features = false, optional = true, version = "1.0.144" }
+sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 zeitgeist-primitives = { default-features = false, path = "../../primitives" }
 zrml-market-commons = { default-features = false, path = "../market-commons" }
 
 [dev-dependencies]
-pallet-balances = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-pallet-timestamp = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-io = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
+pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
 zeitgeist-primitives = { default-features = false, features = ["mock"], path = "../../primitives" }
 
 [features]
diff --git a/zrml/liquidity-mining/src/weights.rs b/zrml/liquidity-mining/src/weights.rs
index 0ada8b83d..16fb23a2d 100644
--- a/zrml/liquidity-mining/src/weights.rs
+++ b/zrml/liquidity-mining/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for zrml_liquidity_mining
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -53,6 +53,6 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: LiquidityMining PerBlockIncentive (r:0 w:1)
     fn set_per_block_distribution() -> Weight {
-        (6_620_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(2_673_000).saturating_add(T::DbWeight::get().writes(1))
     }
 }
diff --git a/zrml/market-commons/Cargo.toml b/zrml/market-commons/Cargo.toml
index 17392e1b2..ad44a7d7e 100644
--- a/zrml/market-commons/Cargo.toml
+++ b/zrml/market-commons/Cargo.toml
@@ -1,16 +1,16 @@
 [dependencies]
-frame-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-sp-arithmetic = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-runtime = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-arithmetic = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 zeitgeist-primitives = { default-features = false, path = "../../primitives" }
 
 [dev-dependencies]
-pallet-balances = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-pallet-timestamp = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-io = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
+pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
 zeitgeist-primitives = { default-features = false, features = ["mock"], path = "../../primitives" }
 
 [features]
diff --git a/zrml/orderbook-v1/Cargo.toml b/zrml/orderbook-v1/Cargo.toml
index 07e59e8c1..f05ad24a4 100644
--- a/zrml/orderbook-v1/Cargo.toml
+++ b/zrml/orderbook-v1/Cargo.toml
@@ -1,18 +1,18 @@
 
 [dependencies]
-frame-benchmarking = { branch = "polkadot-v0.9.26", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" }
-frame-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-orml-traits = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
+frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/substrate" }
+frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+orml-traits = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
 parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-sp-runtime = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 zeitgeist-primitives = { default-features = false, path = "../../primitives" }
 
 # Mock
-orml-tokens = { branch = "polkadot-v0.9.26", git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true }
-pallet-balances = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
-sp-io = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
+orml-tokens = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true }
+pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
+sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
 
 [dev-dependencies]
 zrml-orderbook-v1 = { features = ["mock"], path = "." }
diff --git a/zrml/orderbook-v1/fuzz/Cargo.toml b/zrml/orderbook-v1/fuzz/Cargo.toml
index 1472e91d7..b2c36842f 100644
--- a/zrml/orderbook-v1/fuzz/Cargo.toml
+++ b/zrml/orderbook-v1/fuzz/Cargo.toml
@@ -6,7 +6,7 @@ test = false
 
 [dependencies]
 arbitrary = { features = ["derive"], version = "1.0" }
-frame-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 libfuzzer-sys = "0.4"
 zeitgeist-primitives = { path = "../../../primitives" }
 zrml-orderbook-v1 = { features = ["mock"], path = ".." }
diff --git a/zrml/orderbook-v1/src/weights.rs b/zrml/orderbook-v1/src/weights.rs
index f572f3fb1..a02f0b030 100644
--- a/zrml/orderbook-v1/src/weights.rs
+++ b/zrml/orderbook-v1/src/weights.rs
@@ -45,6 +45,7 @@
 
 #![allow(unused_parens)]
 #![allow(unused_imports)]
+#![allow(clippy::unnecessary_cast)]
 
 use core::marker::PhantomData;
 use frame_support::{traits::Get, weights::Weight};
@@ -64,33 +65,33 @@ pub trait WeightInfoZeitgeist {
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     fn cancel_order_ask() -> Weight {
-        (53_301_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(53_301_000)
+            .saturating_add(T::DbWeight::get().reads(3 as u64))
+            .saturating_add(T::DbWeight::get().writes(3 as u64))
     }
     fn cancel_order_bid() -> Weight {
-        (49_023_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(49_023_000)
+            .saturating_add(T::DbWeight::get().reads(2 as u64))
+            .saturating_add(T::DbWeight::get().writes(2 as u64))
     }
     fn fill_order_ask() -> Weight {
-        (119_376_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(119_376_000)
+            .saturating_add(T::DbWeight::get().reads(4 as u64))
+            .saturating_add(T::DbWeight::get().writes(3 as u64))
     }
     fn fill_order_bid() -> Weight {
-        (119_917_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(119_917_000)
+            .saturating_add(T::DbWeight::get().reads(4 as u64))
+            .saturating_add(T::DbWeight::get().writes(3 as u64))
     }
     fn make_order_ask() -> Weight {
-        (80_092_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(4 as Weight))
+        Weight::from_ref_time(80_092_000)
+            .saturating_add(T::DbWeight::get().reads(3 as u64))
+            .saturating_add(T::DbWeight::get().writes(4 as u64))
     }
     fn make_order_bid() -> Weight {
-        (62_027_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(62_027_000)
+            .saturating_add(T::DbWeight::get().reads(2 as u64))
+            .saturating_add(T::DbWeight::get().writes(3 as u64))
     }
 }
diff --git a/zrml/prediction-markets/Cargo.toml b/zrml/prediction-markets/Cargo.toml
index 397359a17..f12cf796f 100644
--- a/zrml/prediction-markets/Cargo.toml
+++ b/zrml/prediction-markets/Cargo.toml
@@ -1,13 +1,13 @@
 [dependencies]
-frame-benchmarking = { branch = "polkadot-v0.9.26", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" }
-frame-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-orml-traits = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
+frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/substrate" }
+frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+orml-traits = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
 parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-serde = { version = "1.0.137", default-features = false, optional = true }
-sp-arithmetic = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-runtime = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+serde = { version = "1.0.144", default-features = false, optional = true }
+sp-arithmetic = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 zeitgeist-primitives = { default-features = false, path = "../../primitives" }
 zrml-authorized = { default-features = false, path = "../authorized" }
 zrml-court = { default-features = false, path = "../court" }
@@ -16,19 +16,20 @@ zrml-liquidity-mining = { default-features = false, path = "../liquidity-mining"
 zrml-market-commons = { default-features = false, path = "../market-commons" }
 zrml-simple-disputes = { default-features = false, path = "../simple-disputes" }
 
+
 # Mock
 
-orml-asset-registry = { branch = "polkadot-v0.9.26", git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, optional = true }
-orml-currencies = { branch = "polkadot-v0.9.26", git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true }
-orml-tokens = { branch = "polkadot-v0.9.26", git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true }
-pallet-balances = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
-pallet-randomness-collective-flip = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
-pallet-timestamp = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate", optional = true }
-pallet-treasury = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
-sp-api = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
-sp-io = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
+orml-asset-registry = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true }
+orml-currencies = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true }
+orml-tokens = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true }
+pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
+pallet-randomness-collective-flip = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
+pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate", optional = true }
+pallet-treasury = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
+sp-api = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
+sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
 substrate-fixed = { optional = true, git = "https://github.com/encointer/substrate-fixed" }
-xcm = { branch = "release-v0.9.26", git = "https://github.com/paritytech/polkadot", optional = true, default-features = false }
+xcm = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/polkadot", optional = true, default-features = false }
 zrml-prediction-markets-runtime-api = { features = ["std"], optional = true, path = "./runtime-api" }
 zrml-rikiddo = { optional = true, path = "../rikiddo" }
 zrml-swaps = { optional = true, path = "../swaps" }
@@ -70,9 +71,10 @@ std = [
     "frame-benchmarking?/std",
     "frame-support/std",
     "frame-system/std",
-    "orml-traits/std",
     "orml-asset-registry?/std",
+    "orml-traits/std",
     "parity-scale-codec/std",
+    'scale-info/std',
     "serde?/std",
     "sp-arithmetic/std",
     "sp-runtime/std",
diff --git a/zrml/prediction-markets/fuzz/Cargo.toml b/zrml/prediction-markets/fuzz/Cargo.toml
index 53c2e7c64..f0813cf25 100644
--- a/zrml/prediction-markets/fuzz/Cargo.toml
+++ b/zrml/prediction-markets/fuzz/Cargo.toml
@@ -6,7 +6,7 @@ test = false
 
 [dependencies]
 arbitrary = { features = ["derive"], version = "1.0" }
-frame-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 libfuzzer-sys = "0.4"
 zeitgeist-primitives = { features = ["arbitrary", "mock"], default-features = false, path = "../../../primitives" }
 zrml-prediction-markets = { features = ["mock"], path = ".." }
diff --git a/zrml/prediction-markets/runtime-api/Cargo.toml b/zrml/prediction-markets/runtime-api/Cargo.toml
index 6174301a7..194f41697 100644
--- a/zrml/prediction-markets/runtime-api/Cargo.toml
+++ b/zrml/prediction-markets/runtime-api/Cargo.toml
@@ -1,6 +1,6 @@
 [dependencies]
 parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" }
-sp-api = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-api = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 zeitgeist-primitives = { default-features = false, path = "../../../primitives" }
 
 [features]
diff --git a/zrml/prediction-markets/src/lib.rs b/zrml/prediction-markets/src/lib.rs
index 77512db98..356bd0b05 100644
--- a/zrml/prediction-markets/src/lib.rs
+++ b/zrml/prediction-markets/src/lib.rs
@@ -310,7 +310,7 @@ mod pallet {
                 )
                     .into())
             } else {
-                Ok((None, Pays::No).into())
+                Ok((Option::<Weight>::None, Pays::No).into())
             }
         }
 
@@ -427,7 +427,7 @@ mod pallet {
         ) -> DispatchResultWithPostInfo {
             // TODO(#787): Handle Rikiddo benchmarks!
             T::ApproveOrigin::ensure_origin(origin)?;
-            let mut extra_weight = 0;
+            let mut extra_weight = Weight::zero();
             let mut status = MarketStatus::Active;
 
             <zrml_market_commons::Pallet<T>>::mutate_market(&market_id, |m| {
@@ -724,7 +724,7 @@ mod pallet {
 
             let market_id = <zrml_market_commons::Pallet<T>>::push_market(market.clone())?;
             let market_account = <zrml_market_commons::Pallet<T>>::market_account(market_id);
-            let mut extra_weight = 0;
+            let mut extra_weight = Weight::zero();
 
             if market.status == MarketStatus::CollectingSubsidy {
                 extra_weight = Self::start_subsidy(&market, market_id)?;
@@ -1121,7 +1121,8 @@ mod pallet {
                 return Ok(Some(T::WeightInfo::redeem_shares_scalar()).into());
             }
 
-            Ok(None.into())
+            let default_weight: Option<Weight> = None;
+            Ok((default_weight, Pays::No).into())
         }
 
         /// Rejects a market that is waiting for approval from the advisory committee.
@@ -1747,7 +1748,7 @@ mod pallet {
     impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {
         // TODO(#792): Remove outcome assets for accounts! Delete "resolved" assets of `orml_tokens` with storage migration.
         fn on_initialize(now: T::BlockNumber) -> Weight {
-            let mut total_weight: Weight = 0u64;
+            let mut total_weight: Weight = Weight::zero();
 
             // TODO(#808): Use weight when Rikiddo is ready
             let _ = Self::process_subsidy_collecting_markets(
@@ -2475,7 +2476,7 @@ mod pallet {
                 Self::unreserve_creation_bond(market_id)?;
             }
 
-            let mut total_weight = 0;
+            let mut total_weight: Weight = Weight::zero();
 
             let resolved_outcome = match market.status {
                 MarketStatus::Reported => Self::resolve_reported_market(market_id, market)?,
@@ -2508,7 +2509,7 @@ mod pallet {
             current_block: T::BlockNumber,
             current_time: MomentOf<T>,
         ) -> Weight {
-            let mut total_weight = 0;
+            let mut total_weight: Weight = Weight::zero();
             let dbweight = T::DbWeight::get();
             let one_read = T::DbWeight::get().reads(1);
             let one_write = T::DbWeight::get().writes(1);
@@ -2648,7 +2649,7 @@ mod pallet {
                 true
             };
 
-            let mut weight_basis = 0;
+            let mut weight_basis = Weight::zero();
             <MarketsCollectingSubsidy<T>>::mutate(
                 |e: &mut BoundedVec<
                     SubsidyUntil<T::BlockNumber, MomentOf<T>, MarketIdOf<T>>,
@@ -2935,7 +2936,10 @@ mod pallet {
         type MaxDisputes = T::MaxDisputes;
         type Moment = MomentOf<T>;
 
-        fn resolve(market_id: &Self::MarketId, market: &MarketOf<T>) -> Result<u64, DispatchError> {
+        fn resolve(
+            market_id: &Self::MarketId,
+            market: &MarketOf<T>,
+        ) -> Result<Weight, DispatchError> {
             Self::on_resolution(market_id, market)
         }
 
diff --git a/zrml/prediction-markets/src/weights.rs b/zrml/prediction-markets/src/weights.rs
index 496d959a4..385b5f0ff 100644
--- a/zrml/prediction-markets/src/weights.rs
+++ b/zrml/prediction-markets/src/weights.rs
@@ -91,18 +91,20 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: Tokens TotalIssuance (r:2 w:2)
     // Storage: PredictionMarkets Disputes (r:1 w:1)
     // Storage: PredictionMarkets MarketIdsPerDisputeBlock (r:1 w:1)
-    fn admin_destroy_disputed_market(a: u32, d: u32, o: u32, _c: u32, _r: u32) -> Weight {
-        (131_391_000 as Weight)
-            // Standard Error: 3_000
-            .saturating_add((22_410_000 as Weight).saturating_mul(a as Weight))
-            // Standard Error: 56_000
-            .saturating_add((1_219_000 as Weight).saturating_mul(d as Weight))
-            // Standard Error: 3_000
-            .saturating_add((66_000 as Weight).saturating_mul(o as Weight))
-            .saturating_add(T::DbWeight::get().reads(8 as Weight))
-            .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(a as Weight)))
-            .saturating_add(T::DbWeight::get().writes(8 as Weight))
-            .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(a as Weight)))
+    fn admin_destroy_disputed_market(a: u32, d: u32, o: u32, _c: u32, r: u32) -> Weight {
+        Weight::from_ref_time(86_175_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(10_879_000).saturating_mul(a.into()))
+            // Standard Error: 18_000
+            .saturating_add(Weight::from_ref_time(861_000).saturating_mul(d.into()))
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(6_000).saturating_mul(o.into()))
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(54_000).saturating_mul(r.into()))
+            .saturating_add(T::DbWeight::get().reads(8))
+            .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into())))
+            .saturating_add(T::DbWeight::get().writes(8))
+            .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(a.into())))
     }
     // Storage: MarketCommons Markets (r:1 w:1)
     // Storage: Balances Reserves (r:1 w:1)
@@ -113,27 +115,33 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: Tokens TotalIssuance (r:2 w:2)
     // Storage: PredictionMarkets MarketIdsPerReportBlock (r:1 w:1)
     // Storage: PredictionMarkets Disputes (r:0 w:1)
-    fn admin_destroy_reported_market(a: u32, _o: u32, _c: u32, _r: u32) -> Weight {
-        (148_923_000 as Weight)
-            // Standard Error: 4_000
-            .saturating_add((22_300_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(7 as Weight))
-            .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(a as Weight)))
-            .saturating_add(T::DbWeight::get().writes(8 as Weight))
-            .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(a as Weight)))
+    fn admin_destroy_reported_market(a: u32, o: u32, c: u32, r: u32) -> Weight {
+        Weight::from_ref_time(87_265_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(10_869_000).saturating_mul(a.into()))
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(12_000).saturating_mul(o.into()))
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(21_000).saturating_mul(c.into()))
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(17_000).saturating_mul(r.into()))
+            .saturating_add(T::DbWeight::get().reads(7))
+            .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into())))
+            .saturating_add(T::DbWeight::get().writes(8))
+            .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(a.into())))
     }
     // Storage: MarketCommons Markets (r:1 w:1)
     // Storage: PredictionMarkets MarketIdsPerOpenTimeFrame (r:1 w:1)
     // Storage: PredictionMarkets MarketIdsPerCloseTimeFrame (r:1 w:1)
     // Storage: MarketCommons MarketPool (r:1 w:0)
     fn admin_move_market_to_closed(o: u32, c: u32) -> Weight {
-        (38_298_000 as Weight)
+        Weight::from_ref_time(23_683_000)
             // Standard Error: 0
-            .saturating_add((21_000 as Weight).saturating_mul(o as Weight))
+            .saturating_add(Weight::from_ref_time(14_000).saturating_mul(o.into()))
             // Standard Error: 0
-            .saturating_add((7_000 as Weight).saturating_mul(c as Weight))
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+            .saturating_add(Weight::from_ref_time(20_000).saturating_mul(c.into()))
+            .saturating_add(T::DbWeight::get().reads(4))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: MarketCommons Markets (r:1 w:1)
     // Storage: PredictionMarkets MarketIdsPerReportBlock (r:1 w:1)
@@ -141,11 +149,11 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: PredictionMarkets Disputes (r:1 w:1)
     // Storage: MarketCommons MarketPool (r:1 w:0)
     fn admin_move_market_to_resolved_scalar_reported(r: u32) -> Weight {
-        (72_815_000 as Weight)
+        Weight::from_ref_time(40_650_000)
             // Standard Error: 0
-            .saturating_add((58_000 as Weight).saturating_mul(r as Weight))
-            .saturating_add(T::DbWeight::get().reads(5 as Weight))
-            .saturating_add(T::DbWeight::get().writes(4 as Weight))
+            .saturating_add(Weight::from_ref_time(15_000).saturating_mul(r.into()))
+            .saturating_add(T::DbWeight::get().reads(5))
+            .saturating_add(T::DbWeight::get().writes(4))
     }
     // Storage: MarketCommons Markets (r:1 w:1)
     // Storage: PredictionMarkets MarketIdsPerReportBlock (r:1 w:1)
@@ -154,11 +162,11 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: MarketCommons MarketPool (r:1 w:0)
     // Storage: Swaps Pools (r:1 w:1)
     fn admin_move_market_to_resolved_categorical_reported(r: u32) -> Weight {
-        (101_641_000 as Weight)
-            // Standard Error: 1_000
-            .saturating_add((57_000 as Weight).saturating_mul(r as Weight))
-            .saturating_add(T::DbWeight::get().reads(6 as Weight))
-            .saturating_add(T::DbWeight::get().writes(5 as Weight))
+        Weight::from_ref_time(76_526_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(28_000).saturating_mul(r.into()))
+            .saturating_add(T::DbWeight::get().reads(6))
+            .saturating_add(T::DbWeight::get().writes(5))
     }
     // Storage: MarketCommons Markets (r:1 w:1)
     // Storage: PredictionMarkets Disputes (r:1 w:1)
@@ -169,11 +177,12 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: System Account (r:1 w:1)
     // Storage: MarketCommons MarketPool (r:1 w:0)
     fn admin_move_market_to_resolved_scalar_disputed(r: u32) -> Weight {
-        (119_331_000 as Weight)
-            // Standard Error: 1_000
-            .saturating_add((23_000 as Weight).saturating_mul(r as Weight))
-            .saturating_add(T::DbWeight::get().reads(9 as Weight))
-            .saturating_add(T::DbWeight::get().writes(7 as Weight))
+        Weight::from_ref_time(56_260_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(22_000).saturating_mul(r.into()))
+            // Standard Error: 6_000
+            .saturating_add(T::DbWeight::get().reads(8))
+            .saturating_add(T::DbWeight::get().writes(5))
     }
     // Storage: MarketCommons Markets (r:1 w:1)
     // Storage: PredictionMarkets Disputes (r:1 w:1)
@@ -185,39 +194,41 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: MarketCommons MarketPool (r:1 w:0)
     // Storage: Swaps Pools (r:1 w:1)
     fn admin_move_market_to_resolved_categorical_disputed(r: u32) -> Weight {
-        (148_478_000 as Weight)
-            // Standard Error: 1_000
-            .saturating_add((35_000 as Weight).saturating_mul(r as Weight))
-            .saturating_add(T::DbWeight::get().reads(10 as Weight))
-            .saturating_add(T::DbWeight::get().writes(8 as Weight))
+        Weight::from_ref_time(93_329_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(7_000).saturating_mul(r.into()))
+            // Standard Error: 8_000
+            .saturating_add(T::DbWeight::get().reads(9))
+            .saturating_add(T::DbWeight::get().writes(6))
     }
     // Storage: MarketCommons Markets (r:1 w:1)
     // Storage: PredictionMarkets MarketIdsForEdit (r:1 w:0)
     // Storage: Balances Reserves (r:1 w:1)
     fn approve_market() -> Weight {
-        (46_000_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(26_968_000)
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: MarketCommons Markets (r:1 w:0)
     // Storage: PredictionMarkets MarketIdsForEdit (r:1 w:1)
     fn request_edit(_r: u32) -> Weight {
-        (24_170_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(15_701_000)
+            // Standard Error: 0
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: MarketCommons Markets (r:1 w:0)
     // Storage: System Account (r:1 w:1)
     // Storage: Tokens Accounts (r:2 w:2)
     // Storage: Tokens TotalIssuance (r:2 w:2)
     fn buy_complete_set(a: u32) -> Weight {
-        (52_875_000 as Weight)
-            // Standard Error: 4_000
-            .saturating_add((17_255_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(a as Weight)))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(a as Weight)))
+        Weight::from_ref_time(34_178_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(8_264_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into())))
+            .saturating_add(T::DbWeight::get().writes(1))
+            .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(a.into())))
     }
     // Storage: Timestamp Now (r:1 w:0)
     // Storage: Balances Reserves (r:1 w:1)
@@ -225,22 +236,22 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: PredictionMarkets MarketIdsPerCloseTimeFrame (r:1 w:1)
     // Storage: MarketCommons Markets (r:0 w:1)
     fn create_market(m: u32) -> Weight {
-        (46_289_000 as Weight)
+        Weight::from_ref_time(30_604_000)
             // Standard Error: 0
-            .saturating_add((24_000 as Weight).saturating_mul(m as Weight))
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(4 as Weight))
+            .saturating_add(Weight::from_ref_time(17_000).saturating_mul(m.into()))
+            .saturating_add(T::DbWeight::get().reads(4))
+            .saturating_add(T::DbWeight::get().writes(4))
     }
     // Storage: PredictionMarkets MarketIdsForEdit (r:1 w:1)
     // Storage: MarketCommons Markets (r:1 w:1)
     // Storage: PredictionMarkets MarketIdsPerCloseTimeFrame (r:1 w:1)
     // Storage: Timestamp Now (r:1 w:0)
     fn edit_market(m: u32) -> Weight {
-        (40_535_000 as Weight)
+        Weight::from_ref_time(26_200_000)
             // Standard Error: 0
-            .saturating_add((30_000 as Weight).saturating_mul(m as Weight))
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+            .saturating_add(Weight::from_ref_time(27_000).saturating_mul(m.into()))
+            .saturating_add(T::DbWeight::get().reads(4))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: MarketCommons Markets (r:1 w:0)
     // Storage: Swaps NextPoolId (r:1 w:1)
@@ -252,15 +263,15 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: MarketCommons MarketPool (r:1 w:1)
     // Storage: Swaps Pools (r:0 w:1)
     fn deploy_swap_pool_for_market_future_pool(a: u32, o: u32) -> Weight {
-        (91_979_000 as Weight)
-            // Standard Error: 6_000
-            .saturating_add((26_628_000 as Weight).saturating_mul(a as Weight))
-            // Standard Error: 6_000
-            .saturating_add((2_000 as Weight).saturating_mul(o as Weight))
-            .saturating_add(T::DbWeight::get().reads(8 as Weight))
-            .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(a as Weight)))
-            .saturating_add(T::DbWeight::get().writes(7 as Weight))
-            .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(a as Weight)))
+        Weight::from_ref_time(61_235_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(13_099_000).saturating_mul(a.into()))
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(36_000).saturating_mul(o.into()))
+            .saturating_add(T::DbWeight::get().reads(8))
+            .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into())))
+            .saturating_add(T::DbWeight::get().writes(7))
+            .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(a.into())))
     }
     // Storage: MarketCommons Markets (r:1 w:0)
     // Storage: Swaps NextPoolId (r:1 w:1)
@@ -271,43 +282,40 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: MarketCommons MarketPool (r:1 w:1)
     // Storage: Swaps Pools (r:0 w:1)
     fn deploy_swap_pool_for_market_open_pool(a: u32) -> Weight {
-        (94_216_000 as Weight)
-            // Standard Error: 4_000
-            .saturating_add((26_749_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(7 as Weight))
-            .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(a as Weight)))
-            .saturating_add(T::DbWeight::get().writes(6 as Weight))
-            .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(a as Weight)))
+        Weight::from_ref_time(60_792_000)
+            // Standard Error: 3_000
+            .saturating_add(Weight::from_ref_time(13_322_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(7))
+            .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into())))
+            .saturating_add(T::DbWeight::get().writes(6))
+            .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(a.into())))
     }
     // Storage: MarketCommons Markets (r:1 w:0)
     // Storage: PredictionMarkets Disputes (r:1 w:0)
     // Storage: GlobalDisputes Winners (r:1 w:1)
     // Storage: GlobalDisputes Outcomes (r:7 w:7)
     // Storage: PredictionMarkets MarketIdsPerDisputeBlock (r:2 w:2)
-    fn start_global_dispute(m: u32, n: u32) -> Weight {
-        (94_106_000 as Weight)
-            // Standard Error: 0
-            .saturating_add((15_000 as Weight).saturating_mul(m as Weight))
-            // Standard Error: 0
-            .saturating_add((20_000 as Weight).saturating_mul(n as Weight))
-            .saturating_add(T::DbWeight::get().reads(12 as Weight))
-            .saturating_add(T::DbWeight::get().writes(10 as Weight))
+    fn start_global_dispute(_m: u32, _n: u32) -> Weight {
+        Weight::from_ref_time(55_642_000)
+            .saturating_add(T::DbWeight::get().reads(12))
+            .saturating_add(T::DbWeight::get().writes(10))
     }
     // Storage: PredictionMarkets Disputes (r:1 w:1)
     // Storage: MarketCommons Markets (r:1 w:1)
     // Storage: Balances Reserves (r:1 w:1)
+    // Storage: PredictionMarkets MarketIdsPerDisputeBlock (r:1 w:1)
     fn dispute_authorized() -> Weight {
-        (46_000_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(34_018_000)
+            .saturating_add(T::DbWeight::get().reads(4))
+            .saturating_add(T::DbWeight::get().writes(4))
     }
     // Storage: MarketCommons Markets (r:1 w:1)
     // Storage: Balances Reserves (r:1 w:1)
     // Storage: PredictionMarkets MarketIdsForEdit (r:0 w:1)
     fn handle_expired_advised_market() -> Weight {
-        (49_000_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(25_833_000)
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: MarketCommons Markets (r:1 w:1)
     // Storage: Balances Reserves (r:1 w:1)
@@ -315,9 +323,9 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: MarketCommons MarketPool (r:1 w:0)
     // Storage: Swaps Pools (r:1 w:1)
     fn internal_resolve_categorical_reported() -> Weight {
-        (85_000_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(5 as Weight))
-            .saturating_add(T::DbWeight::get().writes(4 as Weight))
+        Weight::from_ref_time(66_879_000)
+            .saturating_add(T::DbWeight::get().reads(5))
+            .saturating_add(T::DbWeight::get().writes(4))
     }
     // Storage: MarketCommons Markets (r:1 w:1)
     // Storage: Balances Reserves (r:1 w:1)
@@ -326,19 +334,24 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: Authorized AuthorizedOutcomeReports (r:1 w:1)
     // Storage: MarketCommons MarketPool (r:1 w:0)
     // Storage: Swaps Pools (r:1 w:1)
+    // Storage: MarketCommons Markets (r:1 w:1)
+    // Storage: GlobalDisputes Winners (r:1 w:0)
+    // Storage: Authorized AuthorizedOutcomeReports (r:1 w:0)
+    // Storage: System Account (r:1 w:1)
     fn internal_resolve_categorical_disputed() -> Weight {
-        (118_000_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(7 as Weight))
-            .saturating_add(T::DbWeight::get().writes(5 as Weight))
+        Weight::from_ref_time(72_294_000)
+            // Standard Error: 27_000
+            .saturating_add(T::DbWeight::get().reads(6))
+            .saturating_add(T::DbWeight::get().writes(4))
     }
     // Storage: MarketCommons Markets (r:1 w:1)
     // Storage: Balances Reserves (r:1 w:1)
     // Storage: PredictionMarkets Disputes (r:1 w:1)
     // Storage: MarketCommons MarketPool (r:1 w:0)
     fn internal_resolve_scalar_reported() -> Weight {
-        (56_000_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(30_320_000)
+            .saturating_add(T::DbWeight::get().reads(4))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: MarketCommons Markets (r:1 w:1)
     // Storage: Balances Reserves (r:1 w:1)
@@ -346,11 +359,11 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: GlobalDisputes Winners (r:1 w:0)
     // Storage: Authorized AuthorizedOutcomeReports (r:1 w:1)
     // Storage: System Account (r:1 w:1)
-    // Storage: MarketCommons MarketPool (r:1 w:0)
     fn internal_resolve_scalar_disputed() -> Weight {
-        (100_000_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(7 as Weight))
-            .saturating_add(T::DbWeight::get().writes(5 as Weight))
+        Weight::from_ref_time(36_011_000)
+            // Standard Error: 27_000
+            .saturating_add(T::DbWeight::get().reads(5))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: Timestamp Now (r:1 w:0)
     // Storage: PredictionMarkets MarketsCollectingSubsidy (r:1 w:1)
@@ -362,35 +375,35 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: PredictionMarkets MarketIdsPerReportBlock (r:1 w:1)
     // Storage: PredictionMarkets MarketIdsPerDisputeBlock (r:1 w:1)
     fn on_initialize_resolve_overhead() -> Weight {
-        (30_000_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(9 as Weight))
-            .saturating_add(T::DbWeight::get().writes(8 as Weight))
+        Weight::from_ref_time(13_886_000)
+            .saturating_add(T::DbWeight::get().reads(9))
+            .saturating_add(T::DbWeight::get().writes(8))
     }
     // Storage: PredictionMarkets MarketsCollectingSubsidy (r:1 w:1)
     fn process_subsidy_collecting_markets_raw(a: u32) -> Weight {
-        (3_580_000 as Weight)
-            // Standard Error: 1_000
-            .saturating_add((172_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(3_180_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(95_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: MarketCommons Markets (r:1 w:0)
     // Storage: Tokens Accounts (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     // Storage: Tokens TotalIssuance (r:1 w:1)
     fn redeem_shares_categorical() -> Weight {
-        (73_000_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(54_667_000)
+            .saturating_add(T::DbWeight::get().reads(4))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: MarketCommons Markets (r:1 w:0)
     // Storage: Tokens Accounts (r:2 w:2)
     // Storage: System Account (r:1 w:1)
     // Storage: Tokens TotalIssuance (r:2 w:2)
     fn redeem_shares_scalar() -> Weight {
-        (95_000_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(6 as Weight))
-            .saturating_add(T::DbWeight::get().writes(5 as Weight))
+        Weight::from_ref_time(57_736_000)
+            .saturating_add(T::DbWeight::get().reads(6))
+            .saturating_add(T::DbWeight::get().writes(5))
     }
     // Storage: MarketCommons Markets (r:1 w:1)
     // Storage: PredictionMarkets MarketIdsPerOpenTimeFrame (r:1 w:1)
@@ -398,36 +411,37 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: Balances Reserves (r:1 w:1)
     // Storage: PredictionMarkets MarketIdsForEdit (r:0 w:1)
     fn reject_market(c: u32, o: u32, r: u32) -> Weight {
-        (78_886_000 as Weight)
+        Weight::from_ref_time(38_253_000)
             // Standard Error: 0
-            .saturating_add((16_000 as Weight).saturating_mul(c as Weight))
+            .saturating_add(Weight::from_ref_time(18_000).saturating_mul(c.into()))
             // Standard Error: 0
-            .saturating_add((21_000 as Weight).saturating_mul(o as Weight))
+            .saturating_add(Weight::from_ref_time(13_000).saturating_mul(o.into()))
             // Standard Error: 0
-            .saturating_add((2_000 as Weight).saturating_mul(r as Weight))
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().writes(5 as Weight))
+            .saturating_add(Weight::from_ref_time(1_000).saturating_mul(r.into()))
+            .saturating_add(T::DbWeight::get().reads(4))
+            .saturating_add(T::DbWeight::get().writes(5))
     }
     // Storage: MarketCommons Markets (r:1 w:1)
     // Storage: Timestamp Now (r:1 w:0)
     // Storage: PredictionMarkets MarketIdsPerReportBlock (r:1 w:1)
     fn report(_m: u32) -> Weight {
-        (31_024_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(22_398_000)
+            // Standard Error: 0
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: MarketCommons Markets (r:1 w:0)
     // Storage: System Account (r:1 w:1)
     // Storage: Tokens Accounts (r:2 w:2)
     // Storage: Tokens TotalIssuance (r:2 w:2)
     fn sell_complete_set(a: u32) -> Weight {
-        (40_368_000 as Weight)
-            // Standard Error: 4_000
-            .saturating_add((21_523_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(a as Weight)))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(a as Weight)))
+        Weight::from_ref_time(35_149_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(10_429_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into())))
+            .saturating_add(T::DbWeight::get().writes(1))
+            .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(a.into())))
     }
     // Storage: Swaps NextPoolId (r:1 w:1)
     // Storage: RikiddoSigmoidFeeMarketEma RikiddoPerPool (r:1 w:1)
@@ -436,44 +450,44 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: PredictionMarkets MarketsCollectingSubsidy (r:1 w:1)
     // Storage: Swaps Pools (r:0 w:1)
     fn start_subsidy(a: u32) -> Weight {
-        (33_451_000 as Weight)
+        Weight::from_ref_time(22_465_000)
             // Standard Error: 0
-            .saturating_add((52_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(5 as Weight))
-            .saturating_add(T::DbWeight::get().writes(5 as Weight))
+            .saturating_add(Weight::from_ref_time(42_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(5))
+            .saturating_add(T::DbWeight::get().writes(5))
     }
     // Storage: PredictionMarkets MarketIdsPerOpenBlock (r:1 w:1)
     // Storage: MarketCommons Markets (r:32 w:0)
     // Storage: PredictionMarkets MarketIdsPerOpenTimeFrame (r:1 w:1)
     fn market_status_manager(b: u32, f: u32) -> Weight {
-        (15_414_000 as Weight)
-            // Standard Error: 2_000
-            .saturating_add((4_284_000 as Weight).saturating_mul(b as Weight))
-            // Standard Error: 2_000
-            .saturating_add((4_380_000 as Weight).saturating_mul(f as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(f as Weight)))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(25_231_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(1_413_000).saturating_mul(b.into()))
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(1_399_000).saturating_mul(f.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b.into())))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(f.into())))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: PredictionMarkets MarketIdsPerReportBlock (r:1 w:1)
     // Storage: MarketCommons Markets (r:32 w:0)
     // Storage: PredictionMarkets MarketIdsPerDisputeBlock (r:1 w:1)
     fn market_resolution_manager(r: u32, d: u32) -> Weight {
-        (17_183_000 as Weight)
-            // Standard Error: 2_000
-            .saturating_add((4_209_000 as Weight).saturating_mul(r as Weight))
-            // Standard Error: 2_000
-            .saturating_add((4_285_000 as Weight).saturating_mul(d as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(d as Weight)))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
+        Weight::from_ref_time(24_246_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(1_414_000).saturating_mul(r.into()))
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(1_445_000).saturating_mul(d.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(d.into())))
+            .saturating_add(T::DbWeight::get().writes(2))
     }
     // Storage: PredictionMarkets MarketsCollectingSubsidy (r:1 w:1)
     fn process_subsidy_collecting_markets_dummy() -> Weight {
-        (3_000_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(3_049_000)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
 }
diff --git a/zrml/rikiddo/Cargo.toml b/zrml/rikiddo/Cargo.toml
index 3accf67b9..3946c36d8 100644
--- a/zrml/rikiddo/Cargo.toml
+++ b/zrml/rikiddo/Cargo.toml
@@ -1,16 +1,16 @@
 [dependencies]
 arbitrary = { version = "1.0.1", features = ["derive"], optional = true }
 cfg-if = { version = "1.0.0", default-features = false }
-frame-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 hashbrown = { default-features = true, version = "0.11" }
-pallet-balances = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
-pallet-timestamp = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
+pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
+pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
 parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-sp-core = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-io = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
-sp-runtime = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-core = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
+sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 substrate-fixed = { default-features = false, features = ["serde"], git = "https://github.com/encointer/substrate-fixed" }
 zeitgeist-primitives = { default-features = false, path = "../../primitives" }
 
diff --git a/zrml/rikiddo/fuzz/Cargo.toml b/zrml/rikiddo/fuzz/Cargo.toml
index 7abae1f10..a01f8a121 100644
--- a/zrml/rikiddo/fuzz/Cargo.toml
+++ b/zrml/rikiddo/fuzz/Cargo.toml
@@ -72,8 +72,8 @@ test = false
 
 [dependencies]
 arbitrary = { features = ["derive"], version = "1.0" }
-frame-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 libfuzzer-sys = "0.4"
 substrate-fixed = { default-features = false, git = "https://github.com/encointer/substrate-fixed" }
 zrml-rikiddo = { features = ["arbitrary", "mock"], path = ".." }
diff --git a/zrml/simple-disputes/Cargo.toml b/zrml/simple-disputes/Cargo.toml
index 2d158eef3..d6b6ede2b 100644
--- a/zrml/simple-disputes/Cargo.toml
+++ b/zrml/simple-disputes/Cargo.toml
@@ -1,17 +1,17 @@
 [dependencies]
-frame-benchmarking = { branch = "polkadot-v0.9.26", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" }
-frame-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/substrate" }
+frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-sp-runtime = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 zeitgeist-primitives = { default-features = false, path = "../../primitives" }
 zrml-market-commons = { default-features = false, path = "../market-commons" }
 
 [dev-dependencies]
-pallet-balances = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-pallet-timestamp = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-io = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
+pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
 zeitgeist-primitives = { default-features = false, features = ["mock"], path = "../../primitives" }
 
 [features]
diff --git a/zrml/simple-disputes/src/mock.rs b/zrml/simple-disputes/src/mock.rs
index 00ec22b94..a127cf5a8 100644
--- a/zrml/simple-disputes/src/mock.rs
+++ b/zrml/simple-disputes/src/mock.rs
@@ -75,7 +75,7 @@ impl DisputeResolutionApi for NoopResolution {
             Asset<Self::MarketId>,
         >,
     ) -> Result<Weight, DispatchError> {
-        Ok(0)
+        Ok(Weight::zero())
     }
 
     fn add_auto_resolve(
diff --git a/zrml/styx/Cargo.toml b/zrml/styx/Cargo.toml
index 0b3c2831f..ee233d4ff 100644
--- a/zrml/styx/Cargo.toml
+++ b/zrml/styx/Cargo.toml
@@ -1,16 +1,16 @@
 [dependencies]
-frame-benchmarking = { branch = "polkadot-v0.9.26", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" }
-frame-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/substrate" }
+frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-sp-runtime = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 zeitgeist-primitives = { default-features = false, path = "../../primitives" }
 
 [dev-dependencies]
-pallet-balances = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-pallet-timestamp = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-io = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
+pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
+sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" }
 zeitgeist-primitives = { default-features = false, features = ["mock"], path = "../../primitives" }
 
 [features]
diff --git a/zrml/styx/src/weights.rs b/zrml/styx/src/weights.rs
index 8112bbfa2..851a186ab 100644
--- a/zrml/styx/src/weights.rs
+++ b/zrml/styx/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for zrml_styx
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -55,12 +55,12 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: Styx Crossings (r:1 w:1)
     // Storage: Styx BurnAmount (r:1 w:0)
     fn cross() -> Weight {
-        (54_390_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(22_513_000)
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Styx BurnAmount (r:0 w:1)
     fn set_burn_amount() -> Weight {
-        (22_050_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(8_613_000).saturating_add(T::DbWeight::get().writes(1))
     }
 }
diff --git a/zrml/swaps/Cargo.toml b/zrml/swaps/Cargo.toml
index f1c9bc216..051aca111 100644
--- a/zrml/swaps/Cargo.toml
+++ b/zrml/swaps/Cargo.toml
@@ -1,11 +1,11 @@
 [dependencies]
-frame-benchmarking = { branch = "polkadot-v0.9.26", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" }
-frame-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-orml-traits = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
+frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/substrate" }
+frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+orml-traits = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
 parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-sp-runtime = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 substrate-fixed = { default-features = false, git = "https://github.com/encointer/substrate-fixed" }
 zeitgeist-primitives = { default-features = false, path = "../../primitives" }
 zrml-liquidity-mining = { default-features = false, path = "../liquidity-mining" }
@@ -14,12 +14,12 @@ zrml-rikiddo = { default-features = false, path = "../rikiddo" }
 
 # Mock
 
-orml-currencies = { branch = "polkadot-v0.9.26", git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true }
-orml-tokens = { branch = "polkadot-v0.9.26", git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true }
-pallet-balances = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
-pallet-timestamp = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
-sp-api = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
-sp-io = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
+orml-currencies = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true }
+orml-tokens = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true }
+pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
+pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
+sp-api = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
+sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true }
 zrml-swaps-runtime-api = { optional = true, path = "./runtime-api" }
 
 [dev-dependencies]
diff --git a/zrml/swaps/fuzz/Cargo.toml b/zrml/swaps/fuzz/Cargo.toml
index 0351975f0..430efcd92 100644
--- a/zrml/swaps/fuzz/Cargo.toml
+++ b/zrml/swaps/fuzz/Cargo.toml
@@ -54,11 +54,11 @@ test = false
 
 [dependencies]
 arbitrary = { features = ["derive"], version = "1.0" }
-frame-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 libfuzzer-sys = "0.4"
-orml-traits = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
+orml-traits = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
 rand = "0.8.4"
-sp-runtime = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 zeitgeist-primitives = { features = ["mock"], path = "../../../primitives" }
 zrml-swaps = { features = ["mock"], path = ".." }
 
diff --git a/zrml/swaps/rpc/Cargo.toml b/zrml/swaps/rpc/Cargo.toml
index b9a9fe29d..640a11a10 100644
--- a/zrml/swaps/rpc/Cargo.toml
+++ b/zrml/swaps/rpc/Cargo.toml
@@ -1,9 +1,9 @@
 [dependencies]
-jsonrpsee = { version = "0.14.0", features = ["server", "macros"] }
+jsonrpsee = { version = "0.15.1", features = ["server", "macros"] }
 parity-scale-codec = { default-features = false, version = "3.0.0" }
-sp-api = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-blockchain = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-runtime = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-api = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-blockchain = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 zeitgeist-primitives = { default-features = false, path = "../../../primitives" }
 zrml-swaps-runtime-api = { default-features = false, features = ["std"], path = "../runtime-api" }
 
diff --git a/zrml/swaps/runtime-api/Cargo.toml b/zrml/swaps/runtime-api/Cargo.toml
index 9220c4535..78023b6cf 100644
--- a/zrml/swaps/runtime-api/Cargo.toml
+++ b/zrml/swaps/runtime-api/Cargo.toml
@@ -1,7 +1,7 @@
 [dependencies]
 parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" }
-sp-api = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-runtime = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-api = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
+sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" }
 zeitgeist-primitives = { default-features = false, path = "../../../primitives" }
 
 [features]
diff --git a/zrml/swaps/src/benchmarks.rs b/zrml/swaps/src/benchmarks.rs
index f955c8a64..7698325d5 100644
--- a/zrml/swaps/src/benchmarks.rs
+++ b/zrml/swaps/src/benchmarks.rs
@@ -319,7 +319,7 @@ benchmarks! {
             let pool_id: PoolId = i.into();
             PoolsCachedForArbitrage::<T>::insert(pool_id, ());
         }
-        let noop = |_: PoolId| -> Result<Weight, DispatchError> { Ok(0) };
+        let noop = |_: PoolId| -> Result<Weight, DispatchError> { Ok(Weight::zero()) };
     }: {
         Pallet::<T>::apply_to_cached_pools(a, noop, Weight::MAX)
     }
diff --git a/zrml/swaps/src/lib.rs b/zrml/swaps/src/lib.rs
index 9164b2abd..2b14990c7 100644
--- a/zrml/swaps/src/lib.rs
+++ b/zrml/swaps/src/lib.rs
@@ -112,7 +112,7 @@ mod pallet {
     pub(crate) const ARBITRAGE_MAX_ITERATIONS: usize = 30;
     const ARBITRAGE_THRESHOLD: u128 = CENT;
     const MIN_BALANCE: u128 = CENT;
-    const ON_IDLE_MIN_WEIGHT: Weight = 1_000_000;
+    const ON_IDLE_MIN_WEIGHT: Weight = Weight::from_ref_time(1_000_000);
 
     #[pallet::call]
     impl<T: Config> Pallet<T> {
@@ -1098,7 +1098,7 @@ mod pallet {
     impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {
         fn on_idle(_: T::BlockNumber, remaining_weight: Weight) -> Weight {
             if remaining_weight < ON_IDLE_MIN_WEIGHT {
-                return 0;
+                return Weight::zero();
             }
             Self::execute_arbitrage_all(remaining_weight / 2)
         }
@@ -1114,7 +1114,7 @@ mod pallet {
         ) -> Weight {
             // CPMM handling of market profit not supported
             if pool.scoring_rule == ScoringRule::CPMM {
-                return 1_000_000;
+                return Weight::from_ref_time(1_000_000);
             }
 
             // Total pool shares
@@ -1249,19 +1249,19 @@ mod pallet {
             // The division can fail if the benchmark of `apply_to_cached_pools` is not linear in
             // the number of pools. This shouldn't ever happen, but if it does, we ensure that
             // `pool_count` is zero (this isn't really a runtime error).
-            let pool_count: u32 = weight
-                .saturating_sub(overhead)
-                .checked_div(extra_weight_per_pool)
+            let pool_count = weight
+                .ref_time()
+                .saturating_sub(overhead.ref_time())
+                .checked_div(extra_weight_per_pool.ref_time())
                 .unwrap_or_else(|| {
                     log::warn!("Unexpected zero division when calculating arbitrage weight");
-                    Weight::zero()
-                })
-                .saturated_into(); // Saturates only if we have u32::MAX trades per block.
-            if pool_count == 0 {
+                    0_u64
+                });
+            if pool_count == 0_u64 {
                 return weight;
             }
             Self::apply_to_cached_pools(
-                pool_count,
+                pool_count.saturated_into(),
                 |pool_id| Self::execute_arbitrage(pool_id, ARBITRAGE_MAX_ITERATIONS),
                 extra_weight_per_pool,
             )
@@ -1616,7 +1616,7 @@ mod pallet {
             outcome_report: &OutcomeReport,
             winner_payout_account: &T::AccountId,
         ) -> Result<Weight, DispatchError> {
-            let mut extra_weight = 0;
+            let mut extra_weight = Weight::zero();
             let mut total_assets = 0;
 
             Self::mutate_pool(pool_id, |pool| {
@@ -2211,7 +2211,7 @@ mod pallet {
             outcome_report: &OutcomeReport,
             winner_payout_account: &T::AccountId,
         ) -> Result<Weight, DispatchError> {
-            let mut weight = 0;
+            let mut weight = Weight::zero();
             Self::mutate_pool(pool_id, |pool| {
                 ensure!(pool.pool_status == PoolStatus::Closed, Error::<T>::InvalidStateTransition);
                 pool.pool_status = PoolStatus::Clean;
diff --git a/zrml/swaps/src/tests.rs b/zrml/swaps/src/tests.rs
index dc7ba46e1..f6976cd3b 100644
--- a/zrml/swaps/src/tests.rs
+++ b/zrml/swaps/src/tests.rs
@@ -3121,7 +3121,7 @@ fn on_idle_skips_arbitrage_if_price_does_not_exceed_threshold() {
         let pool_id = 0;
         // Force the pool into the cache.
         crate::PoolsCachedForArbitrage::<Runtime>::insert(pool_id, ());
-        Swaps::on_idle(System::block_number(), Weight::max_value());
+        Swaps::on_idle(System::block_number(), Weight::MAX);
         System::assert_has_event(Event::ArbitrageSkipped(pool_id).into());
     });
 }
@@ -3156,7 +3156,7 @@ fn on_idle_arbitrages_pools_with_mint_sell() {
 
         // Force arbitrage hook.
         crate::PoolsCachedForArbitrage::<Runtime>::insert(pool_id, ());
-        Swaps::on_idle(System::block_number(), Weight::max_value());
+        Swaps::on_idle(System::block_number(), Weight::MAX);
 
         let arbitrage_amount = 49_537_658_690;
         assert_eq!(
@@ -3216,7 +3216,7 @@ fn on_idle_arbitrages_pools_with_buy_burn() {
 
         // Force arbitrage hook.
         crate::PoolsCachedForArbitrage::<Runtime>::insert(pool_id, ());
-        Swaps::on_idle(System::block_number(), Weight::max_value());
+        Swaps::on_idle(System::block_number(), Weight::MAX);
 
         assert_eq!(
             Currencies::free_balance(base_asset, &pool_account_id),
@@ -3241,8 +3241,8 @@ fn apply_to_cached_pools_only_drains_requested_pools() {
         let number_of_pools_to_retain: u32 = 3;
         Swaps::apply_to_cached_pools(
             pool_count.saturated_into::<u32>() - number_of_pools_to_retain,
-            |_| Ok(0),
-            Weight::max_value(),
+            |_| Ok(Weight::zero()),
+            Weight::MAX,
         );
         assert_eq!(
             PoolsCachedForArbitrage::<Runtime>::iter().count(),
diff --git a/zrml/swaps/src/weights.rs b/zrml/swaps/src/weights.rs
index e12685039..df697b258 100644
--- a/zrml/swaps/src/weights.rs
+++ b/zrml/swaps/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for zrml_swaps
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-11-25, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-12-23, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -80,70 +80,70 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: MarketCommons MarketPool (r:1 w:0)
     // Storage: Swaps Pools (r:1 w:1)
     fn admin_clean_up_pool_cpmm_categorical(a: u32) -> Weight {
-        (57_698_000 as Weight)
-            // Standard Error: 2_000
-            .saturating_add((1_027_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(25_333_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(294_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: MarketCommons Markets (r:1 w:0)
     // Storage: MarketCommons MarketPool (r:1 w:0)
     // Storage: Swaps Pools (r:1 w:1)
     fn admin_clean_up_pool_cpmm_scalar() -> Weight {
-        (52_361_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(22_333_000)
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
-    // Storage: Swaps PoolsCachedForArbitrage (r:7 w:6)
-    // Storage: Swaps Pools (r:6 w:0)
-    // Storage: Tokens Accounts (r:396 w:396)
-    // Storage: System Account (r:6 w:0)
+    // Storage: Swaps PoolsCachedForArbitrage (r:8 w:7)
+    // Storage: Swaps Pools (r:7 w:0)
+    // Storage: Tokens Accounts (r:462 w:462)
+    // Storage: System Account (r:7 w:0)
     // Storage: Tokens TotalIssuance (r:64 w:64)
     fn apply_to_cached_pools_execute_arbitrage(a: u32) -> Weight {
-        (0 as Weight)
-            // Standard Error: 905_000
-            .saturating_add((3_336_767_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(44 as Weight))
-            .saturating_add(T::DbWeight::get().reads((69 as Weight).saturating_mul(a as Weight)))
-            .saturating_add(T::DbWeight::get().writes(44 as Weight))
-            .saturating_add(T::DbWeight::get().writes((67 as Weight).saturating_mul(a as Weight)))
+        Weight::from_ref_time(0)
+            // Standard Error: 105_000
+            .saturating_add(Weight::from_ref_time(933_426_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(43))
+            .saturating_add(T::DbWeight::get().reads((70_u64).saturating_mul(a.into())))
+            .saturating_add(T::DbWeight::get().writes(42))
+            .saturating_add(T::DbWeight::get().writes((67_u64).saturating_mul(a.into())))
     }
-    // Storage: Swaps PoolsCachedForArbitrage (r:7 w:6)
+    // Storage: Swaps PoolsCachedForArbitrage (r:8 w:7)
     fn apply_to_cached_pools_noop(a: u32) -> Weight {
-        (0 as Weight)
-            // Standard Error: 7_000
-            .saturating_add((10_520_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(a as Weight)))
-            .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(a as Weight)))
+        Weight::from_ref_time(0)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(3_438_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into())))
+            .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(a.into())))
     }
     // Storage: Swaps Pools (r:1 w:1)
     // Storage: Swaps SubsidyProviders (r:1 w:0)
     // Storage: RikiddoSigmoidFeeMarketEma RikiddoPerPool (r:1 w:1)
     // Storage: Tokens Accounts (r:1 w:1)
     fn destroy_pool_in_subsidy_phase(a: u32) -> Weight {
-        (44_428_000 as Weight)
-            // Standard Error: 17_000
-            .saturating_add((25_843_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(a as Weight)))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(a as Weight)))
+        Weight::from_ref_time(20_186_000)
+            // Standard Error: 6_000
+            .saturating_add(Weight::from_ref_time(9_439_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into())))
+            .saturating_add(T::DbWeight::get().writes(2))
+            .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(a.into())))
     }
     // Storage: Tokens TotalIssuance (r:2 w:1)
     // Storage: Tokens Accounts (r:46 w:22)
     // Storage: System Account (r:2 w:1)
     fn distribute_pool_share_rewards(a: u32, b: u32) -> Weight {
-        (29_974_000 as Weight)
-            // Standard Error: 77_000
-            .saturating_add((43_084_000 as Weight).saturating_mul(a as Weight))
-            // Standard Error: 77_000
-            .saturating_add((50_328_000 as Weight).saturating_mul(b as Weight))
-            .saturating_add(T::DbWeight::get().reads(8 as Weight))
-            .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(a as Weight)))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(b as Weight)))
+        Weight::from_ref_time(25_316_000)
+            // Standard Error: 18_000
+            .saturating_add(Weight::from_ref_time(10_887_000).saturating_mul(a.into()))
+            // Standard Error: 18_000
+            .saturating_add(Weight::from_ref_time(16_348_000).saturating_mul(b.into()))
+            .saturating_add(T::DbWeight::get().reads(7))
+            .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(a.into())))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b.into())))
+            .saturating_add(T::DbWeight::get().writes(2))
+            .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(b.into())))
     }
     // Storage: Swaps Pools (r:1 w:1)
     // Storage: Swaps SubsidyProviders (r:11 w:10)
@@ -152,70 +152,70 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: Tokens TotalIssuance (r:2 w:2)
     // Storage: RikiddoSigmoidFeeMarketEma RikiddoPerPool (r:1 w:0)
     fn end_subsidy_phase(a: u32, b: u32) -> Weight {
-        (0 as Weight)
-            // Standard Error: 194_000
-            .saturating_add((36_944_000 as Weight).saturating_mul(a as Weight))
-            // Standard Error: 1_231_000
-            .saturating_add((175_983_000 as Weight).saturating_mul(b as Weight))
-            .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(a as Weight)))
-            .saturating_add(T::DbWeight::get().reads((9 as Weight).saturating_mul(b as Weight)))
-            .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(a as Weight)))
-            .saturating_add(T::DbWeight::get().writes((9 as Weight).saturating_mul(b as Weight)))
+        Weight::from_ref_time(0)
+            // Standard Error: 68_000
+            .saturating_add(Weight::from_ref_time(10_591_000).saturating_mul(a.into()))
+            // Standard Error: 418_000
+            .saturating_add(Weight::from_ref_time(50_291_000).saturating_mul(b.into()))
+            .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into())))
+            .saturating_add(T::DbWeight::get().reads((9_u64).saturating_mul(b.into())))
+            .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(a.into())))
+            .saturating_add(T::DbWeight::get().writes((9_u64).saturating_mul(b.into())))
     }
     // Storage: Swaps Pools (r:1 w:0)
     // Storage: Tokens Accounts (r:3 w:3)
     // Storage: System Account (r:1 w:0)
     // Storage: Tokens TotalIssuance (r:1 w:1)
     fn execute_arbitrage_buy_burn(a: u32) -> Weight {
-        (0 as Weight)
-            // Standard Error: 18_000
-            .saturating_add((52_561_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(2 as Weight))
-            .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(a as Weight)))
-            .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(a as Weight)))
+        Weight::from_ref_time(31_946_000)
+            // Standard Error: 9_000
+            .saturating_add(Weight::from_ref_time(15_353_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into())))
+            .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(a.into())))
     }
     // Storage: Swaps Pools (r:1 w:0)
     // Storage: Tokens Accounts (r:3 w:3)
     // Storage: System Account (r:2 w:1)
     // Storage: Tokens TotalIssuance (r:1 w:1)
     fn execute_arbitrage_mint_sell(a: u32) -> Weight {
-        (19_956_000 as Weight)
-            // Standard Error: 16_000
-            .saturating_add((48_596_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(a as Weight)))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(a as Weight)))
+        Weight::from_ref_time(35_968_000)
+            // Standard Error: 8_000
+            .saturating_add(Weight::from_ref_time(14_347_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into())))
+            .saturating_add(T::DbWeight::get().writes(1))
+            .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(a.into())))
     }
     // Storage: Swaps Pools (r:1 w:0)
     // Storage: Tokens Accounts (r:2 w:0)
     fn execute_arbitrage_skipped(a: u32) -> Weight {
-        (16_944_000 as Weight)
-            // Standard Error: 3_000
-            .saturating_add((9_053_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(a as Weight)))
+        Weight::from_ref_time(14_082_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(2_260_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into())))
     }
     // Storage: Swaps Pools (r:1 w:0)
     // Storage: Tokens TotalIssuance (r:1 w:1)
     // Storage: Tokens Accounts (r:5 w:5)
     // Storage: System Account (r:1 w:0)
     fn pool_exit(a: u32) -> Weight {
-        (47_671_000 as Weight)
-            // Standard Error: 17_000
-            .saturating_add((39_937_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(4 as Weight))
-            .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(a as Weight)))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(a as Weight)))
+        Weight::from_ref_time(36_569_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(11_401_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(4))
+            .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into())))
+            .saturating_add(T::DbWeight::get().writes(2))
+            .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(a.into())))
     }
     // Storage: Swaps Pools (r:1 w:1)
     // Storage: Swaps SubsidyProviders (r:1 w:1)
     // Storage: Tokens Accounts (r:1 w:1)
     fn pool_exit_subsidy() -> Weight {
-        (86_760_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(37_487_000)
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: Swaps Pools (r:1 w:0)
     // Storage: Tokens Accounts (r:3 w:3)
@@ -223,9 +223,9 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: System Account (r:1 w:0)
     // Storage: Swaps PoolsCachedForArbitrage (r:0 w:1)
     fn pool_exit_with_exact_asset_amount() -> Weight {
-        (184_191_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(6 as Weight))
-            .saturating_add(T::DbWeight::get().writes(5 as Weight))
+        Weight::from_ref_time(69_403_000)
+            .saturating_add(T::DbWeight::get().reads(6))
+            .saturating_add(T::DbWeight::get().writes(5))
     }
     // Storage: Swaps Pools (r:1 w:0)
     // Storage: Tokens TotalIssuance (r:1 w:1)
@@ -233,64 +233,64 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: System Account (r:1 w:0)
     // Storage: Swaps PoolsCachedForArbitrage (r:0 w:1)
     fn pool_exit_with_exact_pool_amount() -> Weight {
-        (184_751_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(6 as Weight))
-            .saturating_add(T::DbWeight::get().writes(5 as Weight))
+        Weight::from_ref_time(69_695_000)
+            .saturating_add(T::DbWeight::get().reads(6))
+            .saturating_add(T::DbWeight::get().writes(5))
     }
     // Storage: Swaps Pools (r:1 w:0)
     // Storage: Tokens TotalIssuance (r:1 w:1)
     // Storage: Tokens Accounts (r:5 w:5)
     fn pool_join(a: u32) -> Weight {
-        (42_632_000 as Weight)
-            // Standard Error: 14_000
-            .saturating_add((36_906_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(a as Weight)))
-            .saturating_add(T::DbWeight::get().writes(2 as Weight))
-            .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(a as Weight)))
+        Weight::from_ref_time(32_481_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(10_527_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into())))
+            .saturating_add(T::DbWeight::get().writes(2))
+            .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(a.into())))
     }
     // Storage: Swaps Pools (r:1 w:1)
     // Storage: Tokens Accounts (r:1 w:1)
     // Storage: Swaps SubsidyProviders (r:1 w:1)
     fn pool_join_subsidy() -> Weight {
-        (88_700_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(3 as Weight))
-            .saturating_add(T::DbWeight::get().writes(3 as Weight))
+        Weight::from_ref_time(37_677_000)
+            .saturating_add(T::DbWeight::get().reads(3))
+            .saturating_add(T::DbWeight::get().writes(3))
     }
     // Storage: Swaps Pools (r:1 w:0)
     // Storage: Tokens TotalIssuance (r:1 w:1)
     // Storage: Tokens Accounts (r:3 w:3)
     // Storage: Swaps PoolsCachedForArbitrage (r:0 w:1)
     fn pool_join_with_exact_asset_amount() -> Weight {
-        (165_460_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(5 as Weight))
-            .saturating_add(T::DbWeight::get().writes(5 as Weight))
+        Weight::from_ref_time(62_027_000)
+            .saturating_add(T::DbWeight::get().reads(5))
+            .saturating_add(T::DbWeight::get().writes(5))
     }
     // Storage: Swaps Pools (r:1 w:0)
     // Storage: Tokens TotalIssuance (r:1 w:1)
     // Storage: Tokens Accounts (r:3 w:3)
     // Storage: Swaps PoolsCachedForArbitrage (r:0 w:1)
     fn pool_join_with_exact_pool_amount() -> Weight {
-        (162_000_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(5 as Weight))
-            .saturating_add(T::DbWeight::get().writes(5 as Weight))
+        Weight::from_ref_time(62_390_000)
+            .saturating_add(T::DbWeight::get().reads(5))
+            .saturating_add(T::DbWeight::get().writes(5))
     }
     // Storage: Swaps Pools (r:1 w:1)
     fn clean_up_pool_categorical_without_reward_distribution(a: u32) -> Weight {
-        (11_083_000 as Weight)
-            // Standard Error: 1_000
-            .saturating_add((581_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(5_716_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(182_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Swaps Pools (r:1 w:0)
     // Storage: Tokens Accounts (r:4 w:4)
     // Storage: System Account (r:1 w:0)
     // Storage: Swaps PoolsCachedForArbitrage (r:0 w:1)
     fn swap_exact_amount_in_cpmm() -> Weight {
-        (223_361_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(6 as Weight))
-            .saturating_add(T::DbWeight::get().writes(5 as Weight))
+        Weight::from_ref_time(81_560_000)
+            .saturating_add(T::DbWeight::get().reads(6))
+            .saturating_add(T::DbWeight::get().writes(5))
     }
     // Storage: Swaps Pools (r:1 w:0)
     // Storage: Tokens Accounts (r:3 w:3)
@@ -299,21 +299,21 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: System Account (r:1 w:0)
     // Storage: Timestamp Now (r:1 w:0)
     fn swap_exact_amount_in_rikiddo(a: u32) -> Weight {
-        (140_111_000 as Weight)
-            // Standard Error: 10_000
-            .saturating_add((25_517_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(6 as Weight))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(a as Weight)))
-            .saturating_add(T::DbWeight::get().writes(5 as Weight))
+        Weight::from_ref_time(68_347_000)
+            // Standard Error: 2_000
+            .saturating_add(Weight::from_ref_time(7_471_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(6))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into())))
+            .saturating_add(T::DbWeight::get().writes(5))
     }
     // Storage: Swaps Pools (r:1 w:0)
     // Storage: Tokens Accounts (r:4 w:4)
     // Storage: System Account (r:1 w:0)
     // Storage: Swaps PoolsCachedForArbitrage (r:0 w:1)
     fn swap_exact_amount_out_cpmm() -> Weight {
-        (217_140_000 as Weight)
-            .saturating_add(T::DbWeight::get().reads(6 as Weight))
-            .saturating_add(T::DbWeight::get().writes(5 as Weight))
+        Weight::from_ref_time(81_909_000)
+            .saturating_add(T::DbWeight::get().reads(6))
+            .saturating_add(T::DbWeight::get().writes(5))
     }
     // Storage: Swaps Pools (r:1 w:0)
     // Storage: Tokens Accounts (r:4 w:3)
@@ -321,39 +321,39 @@ impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
     // Storage: RikiddoSigmoidFeeMarketEma RikiddoPerPool (r:1 w:1)
     // Storage: Timestamp Now (r:1 w:0)
     fn swap_exact_amount_out_rikiddo(a: u32) -> Weight {
-        (73_337_000 as Weight)
-            // Standard Error: 10_000
-            .saturating_add((45_756_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(6 as Weight))
-            .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(a as Weight)))
-            .saturating_add(T::DbWeight::get().writes(5 as Weight))
+        Weight::from_ref_time(51_173_000)
+            // Standard Error: 3_000
+            .saturating_add(Weight::from_ref_time(13_039_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(6))
+            .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into())))
+            .saturating_add(T::DbWeight::get().writes(5))
     }
     // Storage: Swaps Pools (r:1 w:1)
     fn open_pool(a: u32) -> Weight {
-        (26_996_000 as Weight)
-            // Standard Error: 1_000
-            .saturating_add((880_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(12_594_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(261_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Swaps Pools (r:1 w:1)
     fn close_pool(a: u32) -> Weight {
-        (25_651_000 as Weight)
-            // Standard Error: 1_000
-            .saturating_add((650_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
+        Weight::from_ref_time(11_446_000)
+            // Standard Error: 0
+            .saturating_add(Weight::from_ref_time(210_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
     }
     // Storage: Swaps Pools (r:1 w:1)
     // Storage: Tokens Accounts (r:2 w:2)
     // Storage: Tokens TotalIssuance (r:2 w:2)
     fn destroy_pool(a: u32) -> Weight {
-        (0 as Weight)
-            // Standard Error: 14_000
-            .saturating_add((33_316_000 as Weight).saturating_mul(a as Weight))
-            .saturating_add(T::DbWeight::get().reads(1 as Weight))
-            .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(a as Weight)))
-            .saturating_add(T::DbWeight::get().writes(1 as Weight))
-            .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(a as Weight)))
+        Weight::from_ref_time(15_607_000)
+            // Standard Error: 1_000
+            .saturating_add(Weight::from_ref_time(10_020_000).saturating_mul(a.into()))
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into())))
+            .saturating_add(T::DbWeight::get().writes(1))
+            .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(a.into())))
     }
 }