diff --git a/Cargo.lock b/Cargo.lock
index 19fcd113e94..ca8a3becbe9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -18,7 +18,16 @@ version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7"
 dependencies = [
- "gimli",
+ "gimli 0.23.0",
+]
+
+[[package]]
+name = "addr2line"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03345e98af8f3d786b6d9f656ccfa6ac316d954e92bc4841f0bba20789d5fb5a"
+dependencies = [
+ "gimli 0.24.0",
 ]
 
 [[package]]
@@ -89,13 +98,24 @@ checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.15"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "alga"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2"
+dependencies = [
+ "approx 0.3.2",
+ "num-complex 0.2.4",
+ "num-traits",
+]
+
 [[package]]
 name = "always-assert"
 version = "0.1.2"
@@ -135,6 +155,15 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "approx"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "arrayref"
 version = "0.3.6"
@@ -157,23 +186,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 
 [[package]]
-name = "asn1_der"
-version = "0.6.3"
+name = "arrayvec"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fce6b6a0ffdafebd82c87e79e3f40e8d2c523e5fea5566ff6b90509bf98d638"
-dependencies = [
- "asn1_der_derive",
-]
+checksum = "5a2f58b0bb10c380af2b26e57212856b8c9a59e0925b4c20f4a174a49734eaf7"
 
 [[package]]
-name = "asn1_der_derive"
-version = "0.1.2"
+name = "asn1_der"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502"
-dependencies = [
- "quote",
- "syn",
-]
+checksum = "9d6e24d2cce90c53b948c46271bfb053e4bdc2db9b5d3f65e20f8cf28a1b7fc3"
 
 [[package]]
 name = "assert_matches"
@@ -181,6 +203,16 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
 
+[[package]]
+name = "async-attributes"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
+dependencies = [
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "async-channel"
 version = "1.6.1"
@@ -194,16 +226,16 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb877970c7b440ead138f6321a3b5395d6061183af779340b65e20c0fede9146"
+checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965"
 dependencies = [
  "async-task",
  "concurrent-queue",
  "fastrand",
  "futures-lite",
  "once_cell",
- "vec-arena",
+ "slab",
 ]
 
 [[package]]
@@ -224,29 +256,29 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "1.3.1"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9315f8f07556761c3e48fec2e6b276004acf426e6dc068b2c2251854d65ee0fd"
+checksum = "4bbfd5cf2794b1e908ea8457e6c45f8f8f1f6ec5f74617bf4662623f47503c3b"
 dependencies = [
  "concurrent-queue",
  "fastrand",
  "futures-lite",
  "libc",
  "log",
- "nb-connect",
  "once_cell",
  "parking",
  "polling",
- "vec-arena",
+ "slab",
+ "socket2 0.4.0",
  "waker-fn",
  "winapi 0.3.9",
 ]
 
 [[package]]
 name = "async-lock"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1996609732bde4a9988bc42125f55f2af5f3c36370e27c778d5191a4a1b63bfb"
+checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b"
 dependencies = [
  "event-listener",
 ]
@@ -262,15 +294,16 @@ dependencies = [
 
 [[package]]
 name = "async-process"
-version = "1.0.2"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef37b86e2fa961bae5a4d212708ea0154f904ce31d1a4a7f47e1bbc33a0c040b"
+checksum = "a8f38756dd9ac84671c428afbf7c9f7495feff9ec5b0710f17100098e5b354ac"
 dependencies = [
  "async-io",
  "blocking",
  "cfg-if 1.0.0",
  "event-listener",
  "futures-lite",
+ "libc",
  "once_cell",
  "signal-hook",
  "winapi 0.3.9",
@@ -282,12 +315,13 @@ version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9f06685bad74e0570f5213741bea82158279a4103d988e57bfada11ad230341"
 dependencies = [
+ "async-attributes",
  "async-channel",
  "async-global-executor",
  "async-io",
  "async-lock",
  "async-process",
- "crossbeam-utils 0.8.3",
+ "crossbeam-utils 0.8.4",
  "futures-channel",
  "futures-core",
  "futures-io",
@@ -304,6 +338,20 @@ dependencies = [
  "wasm-bindgen-futures",
 ]
 
+[[package]]
+name = "async-std-resolver"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed4e2c3da14d8ad45acb1e3191db7a918e9505b6f155b218e70a7c9a1a48c638"
+dependencies = [
+ "async-std",
+ "async-trait",
+ "futures-io",
+ "futures-util",
+ "pin-utils",
+ "trust-dns-resolver",
+]
+
 [[package]]
 name = "async-task"
 version = "4.0.3"
@@ -312,9 +360,9 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
 
 [[package]]
 name = "async-trait"
-version = "0.1.48"
+version = "0.1.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf"
+checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -381,15 +429,16 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "backtrace"
-version = "0.3.56"
+version = "0.3.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc"
+checksum = "4717cfcbfaa661a0fd48f8453951837ae7e8f81e481fbb136e3202d72805a744"
 dependencies = [
- "addr2line",
+ "addr2line 0.15.1",
+ "cc",
  "cfg-if 1.0.0",
  "libc",
  "miniz_oxide",
- "object 0.23.0",
+ "object 0.24.0",
  "rustc-demangle",
 ]
 
@@ -424,19 +473,22 @@ dependencies = [
  "basilisk-runtime",
  "cumulus-client-cli",
  "cumulus-client-collator",
+ "cumulus-client-consensus-aura",
+ "cumulus-client-consensus-common",
  "cumulus-client-consensus-relay-chain",
  "cumulus-client-network",
  "cumulus-client-service",
  "cumulus-primitives-core",
+ "cumulus-primitives-parachain-inherent",
  "frame-benchmarking",
  "frame-benchmarking-cli",
  "hex-literal",
  "jsonrpc-core",
  "log",
- "module-amm-rpc",
  "pallet-sudo",
  "pallet-transaction-payment-rpc",
- "parity-scale-codec 2.0.1",
+ "pallet-xyk-rpc",
+ "parity-scale-codec 2.1.1",
  "polkadot-cli",
  "polkadot-parachain",
  "polkadot-primitives",
@@ -455,6 +507,7 @@ dependencies = [
  "sc-executor",
  "sc-finality-grandpa",
  "sc-keystore",
+ "sc-network",
  "sc-rpc",
  "sc-rpc-api",
  "sc-service",
@@ -471,13 +524,17 @@ dependencies = [
  "sp-core",
  "sp-finality-grandpa",
  "sp-inherents",
+ "sp-keystore",
+ "sp-offchain",
  "sp-runtime",
+ "sp-session",
  "sp-timestamp",
  "sp-transaction-pool",
  "sp-trie",
  "structopt",
  "substrate-build-script-utils 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "substrate-frame-rpc-system",
+ "substrate-prometheus-endpoint",
  "substrate-test-client",
  "substrate-test-runtime-client",
 ]
@@ -486,8 +543,8 @@ dependencies = [
 name = "basilisk-runtime"
 version = "3.0.0"
 dependencies = [
+ "cumulus-pallet-aura-ext",
  "cumulus-pallet-parachain-system",
- "cumulus-pallet-xcm-handler",
  "cumulus-primitives-core",
  "cumulus-primitives-parachain-inherent",
  "frame-benchmarking",
@@ -499,14 +556,9 @@ dependencies = [
  "hash-db",
  "hex-literal",
  "memory-db",
- "module-amm-rpc-runtime-api",
  "orml-currencies",
  "orml-tokens",
  "orml-traits",
- "orml-unknown-tokens",
- "orml-xcm-support",
- "orml-xtokens",
- "pallet-amm",
  "pallet-asset-registry",
  "pallet-aura",
  "pallet-balances",
@@ -524,8 +576,10 @@ dependencies = [
  "pallet-transaction-multi-payment",
  "pallet-transaction-payment",
  "pallet-transaction-payment-rpc-runtime-api",
+ "pallet-xyk",
+ "pallet-xyk-rpc-runtime-api",
  "parachain-info",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "polkadot-parachain",
  "primitives",
  "serde",
@@ -547,43 +601,102 @@ dependencies = [
  "substrate-wasm-builder 3.0.0",
  "tracing-core",
  "trie-db",
- "xcm",
- "xcm-builder",
- "xcm-executor",
+]
+
+[[package]]
+name = "beef"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6736e2428df2ca2848d846c43e88745121a6654696e349ce0054a420815a7409"
+
+[[package]]
+name = "beefy-gadget"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.1#5005aa80b067ac400ab375447a76deea6866bab1"
+dependencies = [
+ "beefy-primitives",
+ "futures 0.3.15",
+ "hex",
+ "log",
+ "parity-scale-codec 2.1.1",
+ "parking_lot 0.11.1",
+ "sc-client-api",
+ "sc-keystore",
+ "sc-network",
+ "sc-network-gossip",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-arithmetic",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-core",
+ "sp-keystore",
+ "sp-runtime",
+ "sp-utils",
+ "substrate-prometheus-endpoint",
+ "thiserror",
+]
+
+[[package]]
+name = "beefy-gadget-rpc"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.1#5005aa80b067ac400ab375447a76deea6866bab1"
+dependencies = [
+ "beefy-gadget",
+ "beefy-primitives",
+ "futures 0.3.15",
+ "jsonrpc-core",
+ "jsonrpc-core-client",
+ "jsonrpc-derive",
+ "jsonrpc-pubsub",
+ "log",
+ "parity-scale-codec 2.1.1",
+ "sc-rpc",
+ "serde",
+ "serde_json",
+ "sp-core",
+ "sp-runtime",
+]
+
+[[package]]
+name = "beefy-primitives"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.1#5005aa80b067ac400ab375447a76deea6866bab1"
+dependencies = [
+ "parity-scale-codec 2.1.1",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
 name = "bincode"
-version = "1.3.2"
+version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d175dfa69e619905c4c3cdb7c3c203fa3bdd5d51184e3afdb2742c0280493772"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
 dependencies = [
- "byteorder",
  "serde",
 ]
 
 [[package]]
 name = "bindgen"
-version = "0.55.1"
+version = "0.57.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b13ce559e6433d360c26305643803cb52cfbabbc2b9c47ce04a58493dfb443"
+checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d"
 dependencies = [
  "bitflags",
  "cexpr",
- "cfg-if 0.1.10",
  "clang-sys",
- "clap",
- "env_logger 0.7.1",
  "lazy_static",
  "lazycell",
- "log",
  "peeking_take_while",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash",
  "shlex",
- "which 3.1.1",
 ]
 
 [[package]]
@@ -604,9 +717,9 @@ dependencies = [
 
 [[package]]
 name = "bitvec"
-version = "0.20.2"
+version = "0.20.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f682656975d3a682daff957be4ddeb65d6ad656737cd821f2d00685ae466af1"
+checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848"
 dependencies = [
  "funty",
  "radium 0.6.2",
@@ -740,9 +853,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
 
 [[package]]
 name = "bstr"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d"
+checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279"
 dependencies = [
  "memchr",
 ]
@@ -782,9 +895,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 
 [[package]]
 name = "byteorder"
-version = "1.3.4"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "bytes"
@@ -815,6 +928,15 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
 
+[[package]]
+name = "camino"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4648c6d00a709aa069a236adcaae4f605a6241c72bf5bee79331a4b625921a9"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "cargo-platform"
 version = "0.1.1"
@@ -837,6 +959,20 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "cargo_metadata"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "081e3f0755c1f380c2d010481b6fa2e02973586d5f2b24eebb7a2a1d98b143d8"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver 0.11.0",
+ "semver-parser 0.10.2",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "cc"
 version = "1.0.67"
@@ -929,11 +1065,20 @@ dependencies = [
  "generic-array 0.14.4",
 ]
 
+[[package]]
+name = "ckb-merkle-mountain-range"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e486fe53bb9f2ca0f58cb60e8679a5354fd6687a839942ef0a75967250289ca6"
+dependencies = [
+ "cfg-if 0.1.10",
+]
+
 [[package]]
 name = "clang-sys"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f54d78e30b388d4815220c8dd03fea5656b6c6d32adb59e89061552a102f8da1"
+checksum = "853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c"
 dependencies = [
  "glob",
  "libc",
@@ -1012,10 +1157,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "cpuid-bool"
-version = "0.1.2"
+name = "cpufeatures"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
+checksum = "ed00c67cb5d0a7d64a44f6ad2668db7e7530311dd53ea79bcd4fb022c64911c8"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "cpuid-bool"
@@ -1025,25 +1173,25 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.69.0"
+version = "0.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4066fd63b502d73eb8c5fa6bcab9c7962b05cd580f6b149ee83a8e730d8ce7fb"
+checksum = "bcee7a5107071484772b89fdf37f0f460b7db75f476e43ea7a684fd942470bcf"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.69.0"
+version = "0.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a54e4beb833a3c873a18a8fe735d73d732044004c7539a072c8faa35ccb0c60"
+checksum = "654ab96f0f1cab71c0d323618a58360a492da2c341eb2c1f977fc195c664001b"
 dependencies = [
  "byteorder",
  "cranelift-bforest",
  "cranelift-codegen-meta",
  "cranelift-codegen-shared",
  "cranelift-entity",
- "gimli",
+ "gimli 0.23.0",
  "log",
  "regalloc",
  "serde",
@@ -1054,9 +1202,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.69.0"
+version = "0.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c54cac7cacb443658d8f0ff36a3545822613fa202c946c0891897843bc933810"
+checksum = "65994cfc5be9d5fd10c5fc30bcdddfa50c04bb79c91329287bff846434ff8f14"
 dependencies = [
  "cranelift-codegen-shared",
  "cranelift-entity",
@@ -1064,24 +1212,27 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.69.0"
+version = "0.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a109760aff76788b2cdaeefad6875a73c2b450be13906524f6c2a81e05b8d83c"
+checksum = "889d720b688b8b7df5e4903f9b788c3c59396050f5548e516e58ccb7312463ab"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "cranelift-entity"
-version = "0.69.0"
+version = "0.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b044234aa32531f89a08b487630ddc6744696ec04c8123a1ad388de837f5de3"
+checksum = "1a2e6884a363e42a9ba980193ea8603a4272f8a92bd8bbaf9f57a94dbea0ff96"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.69.0"
+version = "0.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5452b3e4e97538ee5ef2cc071301c69a86c7adf2770916b9d04e9727096abd93"
+checksum = "e6f41e2f9b57d2c030e249d0958f1cdc2c3cd46accf8c0438b3d1944e9153444"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -1091,25 +1242,24 @@ dependencies = [
 
 [[package]]
 name = "cranelift-native"
-version = "0.69.0"
+version = "0.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f68035c10b2e80f26cc29c32fa824380877f38483504c2a47b54e7da311caaf3"
+checksum = "aab70ba7575665375d31cbdea2462916ce58be887834e1b83c860b43b51af637"
 dependencies = [
  "cranelift-codegen",
- "raw-cpuid",
  "target-lexicon",
 ]
 
 [[package]]
 name = "cranelift-wasm"
-version = "0.69.0"
+version = "0.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a530eb9d1c95b3309deb24c3d179d8b0ba5837ed98914a429787c395f614949d"
+checksum = "f2fc3d2e70da6439adf97648dcdf81834363154f2907405345b6fbe7ca38918c"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
  "cranelift-frontend",
- "itertools 0.9.0",
+ "itertools 0.10.0",
  "log",
  "serde",
  "smallvec 1.6.1",
@@ -1128,12 +1278,12 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
+checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-utils 0.8.3",
+ "crossbeam-utils 0.8.4",
 ]
 
 [[package]]
@@ -1154,8 +1304,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-epoch 0.9.3",
- "crossbeam-utils 0.8.3",
+ "crossbeam-epoch 0.9.4",
+ "crossbeam-utils 0.8.4",
 ]
 
 [[package]]
@@ -1175,12 +1325,12 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12"
+checksum = "52fb27eab85b17fbb9f6fd667089e07d6a2eb8743d02639ee7f6a7a7729c9c94"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-utils 0.8.3",
+ "crossbeam-utils 0.8.4",
  "lazy_static",
  "memoffset 0.6.3",
  "scopeguard",
@@ -1210,9 +1360,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
+checksum = "4feb231f0d4d6af81aed15928e58ecf5816aa62a2393e2c82f46973e92a9a278"
 dependencies = [
  "autocfg",
  "cfg-if 1.0.0",
@@ -1278,7 +1428,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-cli"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=rococo-v1#3a205e38e13cd254775e5cca1121f521c5f603e8"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.1#4b2c51514cd5f34a5aa0404d4a2eac86f88203f8"
 dependencies = [
  "sc-cli",
  "sc-service",
@@ -1288,36 +1438,66 @@ dependencies = [
 [[package]]
 name = "cumulus-client-collator"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=rococo-v1#3a205e38e13cd254775e5cca1121f521c5f603e8"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.1#4b2c51514cd5f34a5aa0404d4a2eac86f88203f8"
 dependencies = [
  "cumulus-client-consensus-common",
  "cumulus-client-network",
  "cumulus-primitives-core",
- "futures 0.3.13",
- "parity-scale-codec 2.0.1",
+ "futures 0.3.15",
+ "parity-scale-codec 2.1.1",
  "parking_lot 0.9.0",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-overseer",
  "polkadot-primitives",
  "sc-client-api",
+ "sp-api",
  "sp-consensus",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-state-machine",
+ "tracing",
+]
+
+[[package]]
+name = "cumulus-client-consensus-aura"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.1#4b2c51514cd5f34a5aa0404d4a2eac86f88203f8"
+dependencies = [
+ "async-trait",
+ "cumulus-client-consensus-common",
+ "cumulus-primitives-core",
+ "futures 0.3.15",
+ "parity-scale-codec 2.1.1",
+ "parking_lot 0.9.0",
+ "polkadot-service",
+ "sc-client-api",
+ "sc-consensus-aura",
+ "sc-consensus-slots",
+ "sc-telemetry",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-block-builder",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-consensus-aura",
+ "sp-core",
+ "sp-inherents",
+ "sp-keystore",
+ "sp-runtime",
+ "substrate-prometheus-endpoint",
  "tracing",
 ]
 
 [[package]]
 name = "cumulus-client-consensus-common"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=rococo-v1#3a205e38e13cd254775e5cca1121f521c5f603e8"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.1#4b2c51514cd5f34a5aa0404d4a2eac86f88203f8"
 dependencies = [
  "async-trait",
  "dyn-clone",
- "futures 0.3.13",
- "parity-scale-codec 2.0.1",
+ "futures 0.3.15",
+ "parity-scale-codec 2.1.1",
  "polkadot-primitives",
  "polkadot-runtime",
  "sc-client-api",
@@ -1337,14 +1517,13 @@ dependencies = [
 [[package]]
 name = "cumulus-client-consensus-relay-chain"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=rococo-v1#3a205e38e13cd254775e5cca1121f521c5f603e8"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.1#4b2c51514cd5f34a5aa0404d4a2eac86f88203f8"
 dependencies = [
  "async-trait",
  "cumulus-client-consensus-common",
  "cumulus-primitives-core",
- "cumulus-primitives-parachain-inherent",
- "futures 0.3.13",
- "parity-scale-codec 2.0.1",
+ "futures 0.3.15",
+ "parity-scale-codec 2.1.1",
  "parking_lot 0.9.0",
  "polkadot-service",
  "sc-client-api",
@@ -1362,12 +1541,12 @@ dependencies = [
 [[package]]
 name = "cumulus-client-network"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=rococo-v1#3a205e38e13cd254775e5cca1121f521c5f603e8"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.1#4b2c51514cd5f34a5aa0404d4a2eac86f88203f8"
 dependencies = [
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parking_lot 0.10.2",
  "polkadot-node-primitives",
  "polkadot-parachain",
@@ -1386,13 +1565,13 @@ dependencies = [
 [[package]]
 name = "cumulus-client-service"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=rococo-v1#3a205e38e13cd254775e5cca1121f521c5f603e8"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.1#4b2c51514cd5f34a5aa0404d4a2eac86f88203f8"
 dependencies = [
  "cumulus-client-collator",
  "cumulus-client-consensus-common",
  "cumulus-primitives-core",
- "futures 0.3.13",
- "parity-scale-codec 2.0.1",
+ "futures 0.3.15",
+ "parity-scale-codec 2.1.1",
  "polkadot-primitives",
  "polkadot-service",
  "sc-chain-spec",
@@ -1408,10 +1587,27 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "cumulus-pallet-aura-ext"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.1#4b2c51514cd5f34a5aa0404d4a2eac86f88203f8"
+dependencies = [
+ "frame-executive",
+ "frame-support",
+ "frame-system",
+ "pallet-aura",
+ "parity-scale-codec 2.1.1",
+ "serde",
+ "sp-application-crypto",
+ "sp-consensus-aura",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "cumulus-pallet-parachain-system"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=rococo-v1#3a205e38e13cd254775e5cca1121f521c5f603e8"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.1#4b2c51514cd5f34a5aa0404d4a2eac86f88203f8"
 dependencies = [
  "cumulus-primitives-core",
  "cumulus-primitives-parachain-inherent",
@@ -1422,7 +1618,7 @@ dependencies = [
  "log",
  "memory-db",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "polkadot-parachain",
  "serde",
  "sp-core",
@@ -1438,31 +1634,18 @@ dependencies = [
  "xcm",
 ]
 
-[[package]]
-name = "cumulus-pallet-xcm-handler"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=rococo-v1#3a205e38e13cd254775e5cca1121f521c5f603e8"
-dependencies = [
- "cumulus-primitives-core",
- "frame-support",
- "frame-system",
- "log",
- "parity-scale-codec 2.0.1",
- "sp-std",
- "xcm",
- "xcm-executor",
-]
-
 [[package]]
 name = "cumulus-primitives-core"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=rococo-v1#3a205e38e13cd254775e5cca1121f521c5f603e8"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.1#4b2c51514cd5f34a5aa0404d4a2eac86f88203f8"
 dependencies = [
+ "frame-support",
  "impl-trait-for-tuples",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "polkadot-core-primitives",
  "polkadot-parachain",
  "polkadot-primitives",
+ "sp-api",
  "sp-runtime",
  "sp-std",
  "sp-trie",
@@ -1472,10 +1655,12 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-parachain-inherent"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=rococo-v1#3a205e38e13cd254775e5cca1121f521c5f603e8"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.1#4b2c51514cd5f34a5aa0404d4a2eac86f88203f8"
 dependencies = [
+ "async-trait",
  "cumulus-primitives-core",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
+ "polkadot-service",
  "sc-client-api",
  "sp-api",
  "sp-core",
@@ -1502,9 +1687,9 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "3.0.2"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f627126b946c25a4638eec0ea634fc52506dea98db118aae985118ce7c3d723f"
+checksum = "639891fde0dbea823fc3d798a0fdf9d2f9440a42d64a78ab3488b0ca025117b3"
 dependencies = [
  "byteorder",
  "digest 0.9.0",
@@ -1539,11 +1724,22 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "derive_more"
-version = "0.99.13"
+version = "0.99.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f82b1b72f1263f214c0f823371768776c4f5841b942c9883aa8e5ec584fd0ba6"
+checksum = "5cc7b9cef1e351660e5443924e4f43ab25fbbed3e9a5f052df3677deb4d6b320"
 dependencies = [
  "convert_case",
  "proc-macro2",
@@ -1571,9 +1767,9 @@ dependencies = [
 
 [[package]]
 name = "directories"
-version = "3.0.1"
+version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8fed639d60b58d0f53498ab13d26f621fd77569cc6edb031f4cc36a2ad9da0f"
+checksum = "e69600ff1703123957937708eb27f7a564e48885c537782722ed0ba3189ce1d7"
 dependencies = [
  "dirs-sys",
 ]
@@ -1590,12 +1786,12 @@ dependencies = [
 
 [[package]]
 name = "dirs-sys"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
+checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"
 dependencies = [
  "libc",
- "redox_users 0.3.5",
+ "redox_users",
  "winapi 0.3.9",
 ]
 
@@ -1606,7 +1802,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
 dependencies = [
  "libc",
- "redox_users 0.4.0",
+ "redox_users",
  "winapi 0.3.9",
 ]
 
@@ -1649,9 +1845,9 @@ checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf"
 
 [[package]]
 name = "ed25519"
-version = "1.0.3"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37c66a534cbb46ab4ea03477eae19d5c22c01da8258030280b7bd9d8433fb6ef"
+checksum = "8d0860415b12243916284c67a9be413e044ee6668247b99ba26d94b2bc06c8f6"
 dependencies = [
  "signature",
 ]
@@ -1662,11 +1858,11 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
 dependencies = [
- "curve25519-dalek 3.0.2",
+ "curve25519-dalek 3.1.0",
  "ed25519",
  "rand 0.7.3",
  "serde",
- "sha2 0.9.3",
+ "sha2 0.9.5",
  "zeroize",
 ]
 
@@ -1676,6 +1872,18 @@ version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
 
+[[package]]
+name = "enum-as-inner"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "enumflags2"
 version = "0.6.4"
@@ -1696,6 +1904,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "enumn"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e58b112d5099aa0857c5d05f0eacab86406dd8c0f85fe5d320a13256d29ecf4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.7.1"
@@ -1724,9 +1943,9 @@ dependencies = [
 
 [[package]]
 name = "environmental"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6576a1755ddffd988788025e75bce9e74b018f7cc226198fe931d077911c6d7e"
+checksum = "68b91989ae21441195d7d9b9993a2f9295c7e1a8c96255d8b729accddc124797"
 
 [[package]]
 name = "erased-serde"
@@ -1797,7 +2016,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
 ]
 
 [[package]]
@@ -1836,9 +2055,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
 
 [[package]]
 name = "fastrand"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3"
+checksum = "77b705829d1e87f762c2df6da140b26af5839e1033aa84aa5f56bb688e4e1bdb"
 dependencies = [
  "instant",
 ]
@@ -1869,11 +2088,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c6447e2f8178843749e8c8003206def83ec124a7859475395777a28b5338647c"
 dependencies = [
  "either",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "log",
  "num-traits",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parking_lot 0.11.1",
 ]
 
@@ -1926,9 +2145,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
 ]
 
 [[package]]
@@ -1944,14 +2163,14 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "3.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "frame-system",
  "linregress",
  "log",
- "parity-scale-codec 2.0.1",
- "paste 1.0.5",
+ "parity-scale-codec 2.1.1",
+ "paste",
  "sp-api",
  "sp-io",
  "sp-runtime",
@@ -1963,13 +2182,13 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "Inflector",
  "chrono",
  "frame-benchmarking",
  "handlebars",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sc-cli",
  "sc-client-db",
  "sc-executor",
@@ -1986,11 +2205,11 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sp-arithmetic",
  "sp-npos-elections",
  "sp-std",
@@ -1999,12 +2218,11 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
- "serde",
+ "parity-scale-codec 2.1.1",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -2015,9 +2233,9 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "serde",
  "sp-core",
  "sp-std",
@@ -2026,7 +2244,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -2034,8 +2252,8 @@ dependencies = [
  "impl-trait-for-tuples",
  "log",
  "once_cell",
- "parity-scale-codec 2.0.1",
- "paste 1.0.5",
+ "parity-scale-codec 2.1.1",
+ "paste",
  "serde",
  "smallvec 1.6.1",
  "sp-arithmetic",
@@ -2052,7 +2270,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -2064,7 +2282,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 1.0.0",
@@ -2076,7 +2294,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2086,12 +2304,12 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -2103,12 +2321,12 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sp-core",
  "sp-runtime",
  "sp-std",
@@ -2117,19 +2335,19 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sp-api",
 ]
 
 [[package]]
 name = "frame-try-runtime"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sp-api",
  "sp-runtime",
  "sp-std",
@@ -2137,9 +2355,9 @@ dependencies = [
 
 [[package]]
 name = "fs-err"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcd1163ae48bda72a20ae26d66a04d3094135cadab911cff418ae5e33f253431"
+checksum = "5ebd3504ad6116843b8375ad70df74e7bfe83cac77a1f3fe73200c844d43bfe0"
 
 [[package]]
 name = "fs-swap"
@@ -2199,9 +2417,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
 
 [[package]]
 name = "futures"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1"
+checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2214,9 +2432,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939"
+checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2224,9 +2442,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94"
+checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1"
 
 [[package]]
 name = "futures-cpupool"
@@ -2245,7 +2463,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdcef58a173af8148b182684c9f2d5250875adbcaff7b5794073894f9d8634a9"
 dependencies = [
  "futures 0.1.31",
- "futures 0.3.13",
+ "futures 0.3.15",
  "lazy_static",
  "log",
  "parking_lot 0.9.0",
@@ -2256,9 +2474,9 @@ dependencies = [
 
 [[package]]
 name = "futures-executor"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1"
+checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2268,9 +2486,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59"
+checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1"
 
 [[package]]
 name = "futures-lite"
@@ -2289,10 +2507,11 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7"
+checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121"
 dependencies = [
+ "autocfg",
  "proc-macro-hack",
  "proc-macro2",
  "quote",
@@ -2306,21 +2525,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b"
 dependencies = [
  "futures-io",
- "rustls 0.19.0",
+ "rustls 0.19.1",
  "webpki",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3"
+checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282"
 
 [[package]]
 name = "futures-task"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80"
+checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae"
 
 [[package]]
 name = "futures-timer"
@@ -2336,10 +2555,11 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
 
 [[package]]
 name = "futures-util"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1"
+checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967"
 dependencies = [
+ "autocfg",
  "futures 0.1.31",
  "futures-channel",
  "futures-core",
@@ -2432,6 +2652,12 @@ dependencies = [
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189"
+
 [[package]]
 name = "glob"
 version = "0.3.0"
@@ -2493,7 +2719,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "futures-util",
- "http 0.2.3",
+ "http 0.2.4",
  "indexmap",
  "slab",
  "tokio 0.2.25",
@@ -2504,14 +2730,14 @@ dependencies = [
 
 [[package]]
 name = "handlebars"
-version = "3.5.4"
+version = "3.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "580b6f551b29a3a02436318aed09ba1c58eea177dc49e39beac627ad356730a5"
+checksum = "4498fc115fa7d34de968184e473529abb40eeb6be8bc5f7faba3d08c316cb3e3"
 dependencies = [
  "log",
  "pest",
  "pest_derive",
- "quick-error 2.0.0",
+ "quick-error 2.0.1",
  "serde",
  "serde_json",
 ]
@@ -2607,6 +2833,17 @@ dependencies = [
  "hmac 0.7.1",
 ]
 
+[[package]]
+name = "hostname"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
+dependencies = [
+ "libc",
+ "match_cfg",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "http"
 version = "0.1.21"
@@ -2620,9 +2857,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7245cd7449cc792608c3c8a9eaf69bd4eabbabf802713748fd739c98b82f0747"
+checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
 dependencies = [
  "bytes 1.0.1",
  "fnv",
@@ -2648,14 +2885,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
 dependencies = [
  "bytes 0.5.6",
- "http 0.2.3",
+ "http 0.2.4",
 ]
 
 [[package]]
 name = "httparse"
-version = "1.3.5"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "615caabe2c3160b313d52ccc905335f4ed5f10881dd63dc5699d47e90be85691"
+checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68"
 
 [[package]]
 name = "httpdate"
@@ -2727,12 +2964,12 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2 0.2.7",
- "http 0.2.3",
+ "http 0.2.4",
  "http-body 0.3.1",
  "httparse",
  "httpdate",
  "itoa",
- "pin-project 1.0.6",
+ "pin-project 1.0.7",
  "socket2 0.3.19",
  "tokio 0.2.25",
  "tower-service",
@@ -2771,9 +3008,9 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21"
+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
 dependencies = [
  "matches",
  "unicode-bidi",
@@ -2803,12 +3040,12 @@ dependencies = [
 
 [[package]]
 name = "if-watch"
-version = "0.1.8"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b8538953a3f0d0d3868f0a706eb4273535e10d72acb5c82c1c23ae48835c85"
+checksum = "ae8ab7f67bad3240049cb24fb9cb0b4c2c6af4c245840917fbbdededeee91179"
 dependencies = [
  "async-io",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-lite",
  "if-addrs",
  "ipnet",
@@ -2832,7 +3069,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df170efa359aebdd5cb7fe78edcc67107748e4737bdca8a8fb40d15ea7a877ed"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
 ]
 
 [[package]]
@@ -2905,7 +3142,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 2.0.2",
 ]
 
@@ -2924,6 +3161,18 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2ee15951c035f79eddbef745611ec962f63f4558f1dadf98ab723cc603487c6f"
 
+[[package]]
+name = "ipconfig"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7"
+dependencies = [
+ "socket2 0.3.19",
+ "widestring",
+ "winapi 0.3.9",
+ "winreg",
+]
+
 [[package]]
 name = "ipnet"
 version = "2.3.0"
@@ -2956,18 +3205,18 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
 
 [[package]]
 name = "jobserver"
-version = "0.1.21"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
+checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.50"
+version = "0.3.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c"
+checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -3096,12 +3345,12 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-http-client"
-version = "0.2.0-alpha.3"
+version = "0.2.0-alpha.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b15fc3a0ef2e02d770aa1a221d3412443dcaedc43e27d80c957dd5bbd65321b"
+checksum = "2737440f37efa10e5ef7beeec43d059d29dc92640978be21fcdcef481a2edb0d"
 dependencies = [
  "async-trait",
- "futures 0.3.13",
+ "fnv",
  "hyper 0.13.10",
  "hyper-rustls",
  "jsonrpsee-types",
@@ -3110,17 +3359,17 @@ dependencies = [
  "serde",
  "serde_json",
  "thiserror",
- "unicase",
- "url 2.2.1",
+ "url 2.2.2",
 ]
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.2.0-alpha.3"
+version = "0.2.0-alpha.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb4afbda476e2ee11cc6245055c498c116fc8002d2d60fe8338b6ee15d84c3a"
+checksum = "5784ee8bb31988fa2c7a755fe31b0e21aa51894a67e5c99b6d4470f0253bf31a"
 dependencies = [
  "Inflector",
+ "proc-macro-crate 1.0.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -3128,32 +3377,29 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.2.0-alpha.3"
+version = "0.2.0-alpha.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42a82588b5f7830e94341bb7e79d15f46070ab6f64dde1e3b3719721b61c5bf"
+checksum = "bab3dabceeeeb865897661d532d47202eaae71cd2c606f53cb69f1fbc0555a51"
 dependencies = [
  "async-trait",
- "futures 0.3.13",
+ "beef",
+ "futures-channel",
+ "futures-util",
  "log",
  "serde",
  "serde_json",
- "smallvec 1.6.1",
  "thiserror",
 ]
 
 [[package]]
 name = "jsonrpsee-utils"
-version = "0.2.0-alpha.3"
+version = "0.2.0-alpha.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e65c77838fce96bc554b4a3a159d0b9a2497319ae9305c66ee853998c7ed2fd3"
+checksum = "d63cf4d423614e71fd144a8691208539d2b23d8373e069e2fbe023c5eba5e922"
 dependencies = [
- "futures 0.3.13",
- "globset",
+ "futures-util",
  "hyper 0.13.10",
  "jsonrpsee-types",
- "lazy_static",
- "log",
- "unicase",
 ]
 
 [[package]]
@@ -3174,10 +3420,11 @@ dependencies = [
 
 [[package]]
 name = "kusama-runtime"
-version = "0.8.29"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "bitvec 0.20.2",
+ "beefy-primitives",
+ "bitvec 0.20.4",
  "frame-executive",
  "frame-support",
  "frame-system",
@@ -3193,11 +3440,13 @@ dependencies = [
  "pallet-democracy",
  "pallet-election-provider-multi-phase",
  "pallet-elections-phragmen",
+ "pallet-gilt",
  "pallet-grandpa",
  "pallet-identity",
  "pallet-im-online",
  "pallet-indices",
  "pallet-membership",
+ "pallet-mmr-primitives",
  "pallet-multisig",
  "pallet-nicks",
  "pallet-offences",
@@ -3208,7 +3457,7 @@ dependencies = [
  "pallet-session",
  "pallet-society",
  "pallet-staking",
- "pallet-staking-reward-curve",
+ "pallet-staking-reward-fn",
  "pallet-timestamp",
  "pallet-tips",
  "pallet-transaction-payment",
@@ -3216,20 +3465,24 @@ dependencies = [
  "pallet-treasury",
  "pallet-utility",
  "pallet-vesting",
- "parity-scale-codec 2.0.1",
+ "pallet-xcm",
+ "parity-scale-codec 2.1.1",
  "polkadot-primitives",
  "polkadot-runtime-common",
+ "polkadot-runtime-parachains",
  "rustc-hex",
  "serde",
  "serde_derive",
  "smallvec 1.6.1",
  "sp-api",
+ "sp-arithmetic",
  "sp-authority-discovery",
  "sp-block-builder",
  "sp-consensus-babe",
  "sp-core",
  "sp-inherents",
  "sp-io",
+ "sp-npos-elections",
  "sp-offchain",
  "sp-runtime",
  "sp-session",
@@ -3239,6 +3492,9 @@ dependencies = [
  "sp-version",
  "static_assertions",
  "substrate-wasm-builder 3.0.0",
+ "xcm",
+ "xcm-builder",
+ "xcm-executor",
 ]
 
 [[package]]
@@ -3273,9 +3529,9 @@ dependencies = [
 
 [[package]]
 name = "kvdb-rocksdb"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34446c373ccc494c2124439281c198c7636ccdc2752c06722bbffd56d459c1e4"
+checksum = "94b27cdb788bf1c8ade782289f9dbee626940be2961fd75c7cde993fa2f1ded1"
 dependencies = [
  "fs-swap",
  "kvdb",
@@ -3309,9 +3565,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
 
 [[package]]
 name = "libc"
-version = "0.2.92"
+version = "0.2.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56d855069fafbb9b344c0f962150cd2c1187975cb1c22c1522c240d8c4986714"
+checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
 
 [[package]]
 name = "libloading"
@@ -3341,13 +3597,13 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 
 [[package]]
 name = "libp2p"
-version = "0.35.1"
+version = "0.37.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc225a49973cf9ab10d0cdd6a4b8f0cda299df9b760824bbb623f15f8f0c95a"
+checksum = "08053fbef67cd777049ef7a95ebaca2ece370b4ed7712c3fa404d69a88cb741b"
 dependencies = [
  "atomic",
  "bytes 1.0.1",
- "futures 0.3.13",
+ "futures 0.3.15",
  "lazy_static",
  "libp2p-core",
  "libp2p-deflate",
@@ -3362,6 +3618,7 @@ dependencies = [
  "libp2p-ping",
  "libp2p-plaintext",
  "libp2p-pnet",
+ "libp2p-relay",
  "libp2p-request-response",
  "libp2p-swarm",
  "libp2p-swarm-derive",
@@ -3372,23 +3629,23 @@ dependencies = [
  "libp2p-yamux",
  "parity-multiaddr",
  "parking_lot 0.11.1",
- "pin-project 1.0.6",
+ "pin-project 1.0.7",
  "smallvec 1.6.1",
  "wasm-timer",
 ]
 
 [[package]]
 name = "libp2p-core"
-version = "0.27.1"
+version = "0.28.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a2d56aadc2c2bf22cd7797f86e56a65b5b3994a0136b65be3106938acae7a26"
+checksum = "554d3e7e9e65f939d66b75fd6a4c67f258fe250da61b91f46c545fc4a89b51d9"
 dependencies = [
  "asn1_der",
  "bs58",
  "ed25519-dalek",
  "either",
  "fnv",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "lazy_static",
  "libsecp256k1",
@@ -3397,13 +3654,13 @@ dependencies = [
  "multistream-select",
  "parity-multiaddr",
  "parking_lot 0.11.1",
- "pin-project 1.0.6",
+ "pin-project 1.0.7",
  "prost",
  "prost-build",
  "rand 0.7.3",
  "ring",
  "rw-stream-sink",
- "sha2 0.9.3",
+ "sha2 0.9.5",
  "smallvec 1.6.1",
  "thiserror",
  "unsigned-varint 0.7.0",
@@ -3413,35 +3670,38 @@ dependencies = [
 
 [[package]]
 name = "libp2p-deflate"
-version = "0.27.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d42eed63305f0420736fa487f9acef720c4528bd7852a6a760f5ccde4813345"
+checksum = "a2181a641cd15f9b6ba71b1335800f309012a0a97a29ffaabbbf40e9d3d58f08"
 dependencies = [
  "flate2",
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
 ]
 
 [[package]]
 name = "libp2p-dns"
-version = "0.27.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5153b6db68fd4baa3b304e377db744dd8fea8ff4e4504509ee636abcde88d3e3"
+checksum = "62e63dab8b5ff35e0c101a3e51e843ba782c07bbb1682f5fd827622e0d02b98b"
 dependencies = [
- "futures 0.3.13",
+ "async-std-resolver",
+ "futures 0.3.15",
  "libp2p-core",
  "log",
+ "smallvec 1.6.1",
+ "trust-dns-resolver",
 ]
 
 [[package]]
 name = "libp2p-floodsub"
-version = "0.27.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3c63dfa06581b24b1d12bf9815b43689a784424be217d6545c800c7c75a207f"
+checksum = "48a9b570f6766301d9c4aa00fce3554cad1598e2f466debbc4dde909028417cf"
 dependencies = [
  "cuckoofilter",
  "fnv",
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3453,16 +3713,16 @@ dependencies = [
 
 [[package]]
 name = "libp2p-gossipsub"
-version = "0.28.0"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "502dc5fcbfec4aa1c63ef3f7307ffe20e90c1a1387bf23ed0bec087f2dde58a1"
+checksum = "e7b0c8506a6ec3344b9e706d7c7a6dba826f8ede735cfe13dde12a8c263c4af9"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "base64 0.13.0",
  "byteorder",
  "bytes 1.0.1",
  "fnv",
- "futures 0.3.13",
+ "futures 0.3.15",
  "hex_fmt",
  "libp2p-core",
  "libp2p-swarm",
@@ -3471,7 +3731,7 @@ dependencies = [
  "prost-build",
  "rand 0.7.3",
  "regex",
- "sha2 0.9.3",
+ "sha2 0.9.5",
  "smallvec 1.6.1",
  "unsigned-varint 0.7.0",
  "wasm-timer",
@@ -3479,11 +3739,11 @@ dependencies = [
 
 [[package]]
 name = "libp2p-identify"
-version = "0.27.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b40fb36a059b7a8cce1514bd8b546fa612e006c9937caa7f5950cb20021fe91e"
+checksum = "5f668f00efd9883e8b7bcc582eaf0164615792608f886f6577da18bcbeea0a46"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3495,23 +3755,23 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.28.1"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3da6c9acbcc05f93235d201d7d45ef4e8b88a45d8836f98becd8b4d443f066"
+checksum = "b07312ebe5ee4fd2404447a0609814574df55c65d4e20838b957bbd34907d820"
 dependencies = [
  "arrayvec 0.5.2",
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
  "either",
  "fnv",
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
  "libp2p-swarm",
  "log",
  "prost",
  "prost-build",
  "rand 0.7.3",
- "sha2 0.9.3",
+ "sha2 0.9.5",
  "smallvec 1.6.1",
  "uint 0.9.0",
  "unsigned-varint 0.7.0",
@@ -3521,34 +3781,34 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.28.1"
+version = "0.30.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e9e6374814d1b118d97ccabdfc975c8910bd16dc38a8bc058eeb08bf2080fe1"
+checksum = "4efa70c1c3d2d91237f8546e27aeb85e287d62c066a7b4f3ea6a696d43ced714"
 dependencies = [
  "async-io",
  "data-encoding",
  "dns-parser",
- "futures 0.3.13",
+ "futures 0.3.15",
  "if-watch",
  "lazy_static",
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "rand 0.7.3",
+ "rand 0.8.3",
  "smallvec 1.6.1",
- "socket2 0.3.19",
+ "socket2 0.4.0",
  "void",
 ]
 
 [[package]]
 name = "libp2p-mplex"
-version = "0.27.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350ce8b3923594aedabd5d6e3f875d058435052a29c3f32df378bc70d10be464"
+checksum = "85e9b544335d1ed30af71daa96edbefadef6f19c7a55f078b9fc92c87163105d"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
  "log",
  "nohash-hasher",
@@ -3560,20 +3820,20 @@ dependencies = [
 
 [[package]]
 name = "libp2p-noise"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4aca322b52a0c5136142a7c3971446fb1e9964923a526c9cc6ef3b7c94e57778"
+checksum = "36db0f0db3b0433f5b9463f1c0cd9eadc0a3734a9170439ce501ff99733a88bd"
 dependencies = [
  "bytes 1.0.1",
- "curve25519-dalek 3.0.2",
- "futures 0.3.13",
+ "curve25519-dalek 3.1.0",
+ "futures 0.3.15",
  "lazy_static",
  "libp2p-core",
  "log",
  "prost",
  "prost-build",
  "rand 0.7.3",
- "sha2 0.9.3",
+ "sha2 0.9.5",
  "snow",
  "static_assertions",
  "x25519-dalek",
@@ -3582,11 +3842,11 @@ dependencies = [
 
 [[package]]
 name = "libp2p-ping"
-version = "0.27.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f3813276d0708c8db0f500d8beda1bda9ad955723b9cb272c41f4727256f73c"
+checksum = "bf4bfaffac63bf3c7ec11ed9d8879d455966ddea7e78ee14737f0b6dce0d1cd1"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3597,13 +3857,13 @@ dependencies = [
 
 [[package]]
 name = "libp2p-plaintext"
-version = "0.27.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d58defcadb646ae4b033e130b48d87410bf76394dc3335496cae99dac803e61"
+checksum = "0c8c37b4d2a075b4be8442760a5f8c037180f0c8dd5b5734b9978ab868b3aa11"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
  "log",
  "prost",
@@ -3618,23 +3878,46 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce3374f3b28162db9d3442c9347c4f14cb01e8290052615c7d341d40eae0599"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "log",
- "pin-project 1.0.6",
+ "pin-project 1.0.7",
  "rand 0.7.3",
  "salsa20",
  "sha3",
 ]
 
+[[package]]
+name = "libp2p-relay"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b8786aca3f18671d8776289706a5521f6c9124a820f69e358de214b9939440d"
+dependencies = [
+ "asynchronous-codec 0.6.0",
+ "bytes 1.0.1",
+ "futures 0.3.15",
+ "futures-timer 3.0.2",
+ "libp2p-core",
+ "libp2p-swarm",
+ "log",
+ "pin-project 1.0.7",
+ "prost",
+ "prost-build",
+ "rand 0.7.3",
+ "smallvec 1.6.1",
+ "unsigned-varint 0.7.0",
+ "void",
+ "wasm-timer",
+]
+
 [[package]]
 name = "libp2p-request-response"
-version = "0.9.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10e5552827c33d8326502682da73a0ba4bfa40c1b55b216af3c303f32169dd89"
+checksum = "1cdbe172f08e6d0f95fa8634e273d4c4268c4063de2e33e7435194b0130c62e3"
 dependencies = [
  "async-trait",
  "bytes 1.0.1",
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
  "libp2p-swarm",
  "log",
@@ -3648,12 +3931,12 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.27.2"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7955b973e1fd2bd61ffd43ce261c1223f61f4aacd5bae362a924993f9a25fd98"
+checksum = "1e04d8e1eef675029ec728ba14e8d0da7975d84b6679b699b4ae91a1de9c3a92"
 dependencies = [
  "either",
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
  "log",
  "rand 0.7.3",
@@ -3664,9 +3947,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm-derive"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c564ebaa36a64839f51eaddb0243aaaa29ce64affb56129193cc3248b72af273"
+checksum = "365b0a699fea5168676840567582a012ea297b1ca02eee467e58301b9c9c5eed"
 dependencies = [
  "quote",
  "syn",
@@ -3674,40 +3957,40 @@ dependencies = [
 
 [[package]]
 name = "libp2p-tcp"
-version = "0.27.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a5aef80e519a6cb8e2663605142f97baaaea1a252eecbf8756184765f7471b"
+checksum = "2b1a27d21c477951799e99d5c105d78868258502ce092988040a808d5a19bbd9"
 dependencies = [
  "async-io",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "if-watch",
  "ipnet",
  "libc",
  "libp2p-core",
  "log",
- "socket2 0.3.19",
+ "socket2 0.4.0",
 ]
 
 [[package]]
 name = "libp2p-uds"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80ac51ce419f60be966e02103c17f67ff5dc4422ba83ba54d251d6c62a4ed487"
+checksum = "ffd6564bb3b7ff203661ccbb69003c2b551e34cef974f2d6c6a28306a12170b5"
 dependencies = [
  "async-std",
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
  "log",
 ]
 
 [[package]]
 name = "libp2p-wasm-ext"
-version = "0.27.0"
+version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6149c46cb76935c80bc8be6ec6e3ebd5f5e1679765a255fb34331d54610f15dd"
+checksum = "e2d413e4cf9b8e5dfbcd2a60d3dc5a3391308bdb463684093d4f67137b7113de"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "js-sys",
  "libp2p-core",
  "parity-send-wrapper",
@@ -3717,29 +4000,29 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3b1c6a3431045da8b925ed83384e4c5163e14b990572307fca9c507435d4d22"
+checksum = "cace60995ef6f637e4752cccbb2590f6bc358e8741a0d066307636c69a4b3a74"
 dependencies = [
  "either",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-rustls",
  "libp2p-core",
  "log",
  "quicksink",
  "rw-stream-sink",
  "soketto",
- "url 2.2.1",
+ "url 2.2.2",
  "webpki-roots",
 ]
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.30.1"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4819358c542a86ff95f6ae691efb4b94ddaf477079b01a686f5705b79bfc232a"
+checksum = "f35da42cfc6d5cb0dcf3ad6881bc68d146cdf38f98655e09e33fbba4d13eabc4"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p-core",
  "parking_lot 0.11.1",
  "thiserror",
@@ -3748,8 +4031,9 @@ dependencies = [
 
 [[package]]
 name = "librocksdb-sys"
-version = "6.11.4"
-source = "git+https://github.com/hdevalence/rust-rocksdb?branch=master#33cd4281570b229b628d6d827fa0053cff57000a"
+version = "6.17.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5da125e1c0f22c7cae785982115523a0738728498547f415c9054cb17c7e89f9"
 dependencies = [
  "bindgen",
  "cc",
@@ -3775,9 +4059,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655"
+checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66"
 dependencies = [
  "cc",
  "pkg-config",
@@ -3801,11 +4085,11 @@ dependencies = [
 
 [[package]]
 name = "linregress"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d0ad4b5cc8385a881c561fac3501353d63d2a2b7a357b5064d71815c9a92724"
+checksum = "b36162d2e1dcbdeb61223cb788f029f8ac9f2ab19969b89c5a8f4517aad4d940"
 dependencies = [
- "nalgebra",
+ "nalgebra 0.25.4",
  "statrs",
 ]
 
@@ -3820,9 +4104,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176"
+checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"
 dependencies = [
  "scopeguard",
 ]
@@ -3846,6 +4130,15 @@ dependencies = [
  "hashbrown",
 ]
 
+[[package]]
+name = "lru-cache"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
+dependencies = [
+ "linked-hash-map",
+]
+
 [[package]]
 name = "mach"
 version = "0.3.2"
@@ -3861,6 +4154,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 
+[[package]]
+name = "match_cfg"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
+
 [[package]]
 name = "matchers"
 version = "0.0.1"
@@ -3885,6 +4184,15 @@ dependencies = [
  "rawpointer",
 ]
 
+[[package]]
+name = "matrixmultiply"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a8a15b776d9dfaecd44b03c5828c2199cddff5247215858aac14624f8d6b741"
+dependencies = [
+ "rawpointer",
+]
+
 [[package]]
 name = "maybe-uninit"
 version = "2.0.0"
@@ -3893,9 +4201,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
 
 [[package]]
 name = "memchr"
-version = "2.3.4"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
 
 [[package]]
 name = "memmap2"
@@ -3965,10 +4273,10 @@ dependencies = [
 [[package]]
 name = "metered-channel"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
 ]
 
@@ -3978,25 +4286,25 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c023c3f16109e7f33aa451f773fd61070e265b4977d0b6e344a51049296dd7df"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "rand 0.7.3",
  "thrift",
 ]
 
 [[package]]
 name = "minicbor"
-version = "0.7.2"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c2b2c73f9640fccab53947e2b3474d5071fcbc8f82cac51ddf6c8041a30a9ea"
+checksum = "51aa5bb0ca22415daca596a227b507f880ad1b2318a87fa9325312a5d285ca0d"
 dependencies = [
  "minicbor-derive",
 ]
 
 [[package]]
 name = "minicbor-derive"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce18b5423c573a13e80cb3046ea0af6379ef725dc3af4886bdb8f4e5093068"
+checksum = "7f2b9e8883d58e34b18facd16c4564a77ea50fce028ad3d0ee6753440e37acc8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4088,37 +4396,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "module-amm-rpc"
-version = "3.0.0"
-source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=master#1ae45e9a1ca60e2d1bbc3f315403364728e71dd0"
-dependencies = [
- "jsonrpc-core",
- "jsonrpc-core-client",
- "jsonrpc-derive",
- "module-amm-rpc-runtime-api",
- "parity-scale-codec 2.0.1",
- "serde",
- "sp-api",
- "sp-blockchain",
- "sp-runtime",
- "sp-std",
- "substrate-wasm-builder 3.0.0",
-]
-
-[[package]]
-name = "module-amm-rpc-runtime-api"
-version = "3.0.0"
-source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=master#1ae45e9a1ca60e2d1bbc3f315403364728e71dd0"
-dependencies = [
- "parity-scale-codec 2.0.1",
- "serde",
- "sp-api",
- "sp-runtime",
- "sp-std",
- "substrate-wasm-builder 3.0.0",
-]
-
 [[package]]
 name = "more-asserts"
 version = "0.2.1"
@@ -4148,7 +4425,7 @@ dependencies = [
  "digest 0.9.0",
  "generic-array 0.14.4",
  "multihash-derive",
- "sha2 0.9.3",
+ "sha2 0.9.5",
  "sha3",
  "unsigned-varint 0.5.1",
 ]
@@ -4180,48 +4457,55 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d91ec0a2440aaff5f78ec35631a7027d50386c6163aa975f7caa0d5da4b6ff8"
 dependencies = [
  "bytes 1.0.1",
- "futures 0.3.13",
+ "futures 0.3.15",
  "log",
- "pin-project 1.0.6",
+ "pin-project 1.0.7",
  "smallvec 1.6.1",
  "unsigned-varint 0.7.0",
 ]
 
 [[package]]
 name = "nalgebra"
-version = "0.21.1"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6b6147c3d50b4f3cdabfe2ecc94a0191fd3d6ad58aefd9664cf396285883486"
+checksum = "0abb021006c01b126a936a8dd1351e0720d83995f4fc942d0d426c654f990745"
 dependencies = [
- "approx",
+ "alga",
+ "approx 0.3.2",
  "generic-array 0.13.3",
- "matrixmultiply",
- "num-complex",
- "num-rational",
+ "matrixmultiply 0.2.4",
+ "num-complex 0.2.4",
+ "num-rational 0.2.4",
  "num-traits",
  "rand 0.7.3",
  "rand_distr",
- "simba",
  "typenum",
 ]
 
 [[package]]
-name = "names"
-version = "0.11.0"
+name = "nalgebra"
+version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef320dab323286b50fb5cdda23f61c796a72a89998ab565ca32525c5c556f2da"
+checksum = "c70c9e8c5f213c8e93fc8c112ade4edd3ee62062fb897776c23dcebac7932900"
 dependencies = [
- "rand 0.3.23",
+ "approx 0.4.0",
+ "generic-array 0.14.4",
+ "matrixmultiply 0.3.1",
+ "num-complex 0.3.1",
+ "num-rational 0.3.2",
+ "num-traits",
+ "serde",
+ "simba",
+ "typenum",
 ]
 
 [[package]]
-name = "nb-connect"
-version = "1.1.0"
+name = "names"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19900e7eee95eb2b3c2e26d12a874cc80aaf750e31be6fcbe743ead369fa45d"
+checksum = "ef320dab323286b50fb5cdda23f61c796a72a89998ab565ca32525c5c556f2da"
 dependencies = [
- "libc",
- "socket2 0.4.0",
+ "rand 0.3.23",
 ]
 
 [[package]]
@@ -4235,18 +4519,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "nix"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
-dependencies = [
- "bitflags",
- "cc",
- "cfg-if 1.0.0",
- "libc",
-]
-
 [[package]]
 name = "nodrop"
 version = "0.1.14"
@@ -4290,6 +4562,15 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-complex"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.44"
@@ -4312,6 +4593,17 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-rational"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.14"
@@ -4334,9 +4626,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
+checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
 dependencies = [
  "crc32fast",
  "indexmap",
@@ -4344,9 +4636,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
+checksum = "1a5b3dd1c072ee7963717671d1ca129f1048fda25edea6b752bfc71ac8854170"
 
 [[package]]
 name = "once_cell"
@@ -4371,9 +4663,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
+checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
 
 [[package]]
 name = "ordered-float"
@@ -4387,14 +4679,13 @@ dependencies = [
 [[package]]
 name = "orml-currencies"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#ea01954dc99347451113a652681c2d0104eaa767"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#cfe19133f02dac83dd6652473f9981852c02493f"
 dependencies = [
  "frame-support",
  "frame-system",
- "funty",
  "orml-traits",
  "orml-utilities",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "serde",
  "sp-io",
  "sp-runtime",
@@ -4404,13 +4695,12 @@ dependencies = [
 [[package]]
 name = "orml-tokens"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#ea01954dc99347451113a652681c2d0104eaa767"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#cfe19133f02dac83dd6652473f9981852c02493f"
 dependencies = [
  "frame-support",
  "frame-system",
- "funty",
  "orml-traits",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "serde",
  "sp-runtime",
  "sp-std",
@@ -4419,78 +4709,32 @@ dependencies = [
 [[package]]
 name = "orml-traits"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#ea01954dc99347451113a652681c2d0104eaa767"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#cfe19133f02dac83dd6652473f9981852c02493f"
 dependencies = [
  "frame-support",
- "funty",
  "impl-trait-for-tuples",
  "num-traits",
  "orml-utilities",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "serde",
  "sp-io",
  "sp-runtime",
  "sp-std",
 ]
 
-[[package]]
-name = "orml-unknown-tokens"
-version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#ea01954dc99347451113a652681c2d0104eaa767"
-dependencies = [
- "frame-support",
- "frame-system",
- "orml-xcm-support",
- "parity-scale-codec 2.0.1",
- "sp-std",
- "xcm",
-]
-
 [[package]]
 name = "orml-utilities"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#ea01954dc99347451113a652681c2d0104eaa767"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#cfe19133f02dac83dd6652473f9981852c02493f"
 dependencies = [
  "frame-support",
- "funty",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "serde",
  "sp-io",
  "sp-runtime",
  "sp-std",
 ]
 
-[[package]]
-name = "orml-xcm-support"
-version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#ea01954dc99347451113a652681c2d0104eaa767"
-dependencies = [
- "frame-support",
- "orml-traits",
- "parity-scale-codec 2.0.1",
- "sp-runtime",
- "sp-std",
- "xcm",
- "xcm-executor",
-]
-
-[[package]]
-name = "orml-xtokens"
-version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#ea01954dc99347451113a652681c2d0104eaa767"
-dependencies = [
- "cumulus-primitives-core",
- "frame-support",
- "frame-system",
- "orml-xcm-support",
- "parity-scale-codec 2.0.1",
- "serde",
- "sp-io",
- "sp-runtime",
- "sp-std",
- "xcm",
-]
-
 [[package]]
 name = "owning_ref"
 version = "0.4.1"
@@ -4500,37 +4744,14 @@ dependencies = [
  "stable_deref_trait",
 ]
 
-[[package]]
-name = "pallet-amm"
-version = "4.0.1"
-source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=master#1ae45e9a1ca60e2d1bbc3f315403364728e71dd0"
-dependencies = [
- "frame-benchmarking",
- "frame-support",
- "frame-system",
- "hydra-dx-math",
- "orml-tokens",
- "orml-traits",
- "orml-utilities",
- "pallet-asset-registry",
- "parity-scale-codec 2.0.1",
- "primitive-types 0.8.0",
- "primitives",
- "serde",
- "sp-core",
- "sp-runtime",
- "sp-std",
- "substrate-wasm-builder 3.0.0",
-]
-
 [[package]]
 name = "pallet-asset-registry"
 version = "3.0.1"
-source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=master#1ae45e9a1ca60e2d1bbc3f315403364728e71dd0"
+source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=master#f57debc4c2f8dbb174e46dd9f351e07b8314b930"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "primitive-types 0.8.0",
  "primitives",
  "serde",
@@ -4543,14 +4764,13 @@ dependencies = [
 [[package]]
 name = "pallet-aura"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "frame-system",
  "pallet-session",
  "pallet-timestamp",
- "parity-scale-codec 2.0.1",
- "serde",
+ "parity-scale-codec 2.1.1",
  "sp-application-crypto",
  "sp-consensus-aura",
  "sp-runtime",
@@ -4560,13 +4780,12 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "frame-system",
  "pallet-session",
- "parity-scale-codec 2.0.1",
- "serde",
+ "parity-scale-codec 2.1.1",
  "sp-application-crypto",
  "sp-authority-discovery",
  "sp-runtime",
@@ -4576,14 +4795,13 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sp-authorship",
- "sp-inherents",
  "sp-runtime",
  "sp-std",
 ]
@@ -4591,7 +4809,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4600,8 +4818,7 @@ dependencies = [
  "pallet-authorship",
  "pallet-session",
  "pallet-timestamp",
- "parity-scale-codec 2.0.1",
- "serde",
+ "parity-scale-codec 2.1.1",
  "sp-application-crypto",
  "sp-consensus-babe",
  "sp-consensus-vrf",
@@ -4615,13 +4832,27 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "pallet-beefy"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.1#5005aa80b067ac400ab375447a76deea6866bab1"
+dependencies = [
+ "beefy-primitives",
+ "frame-support",
+ "frame-system",
+ "pallet-session",
+ "parity-scale-codec 2.1.1",
  "serde",
  "sp-runtime",
  "sp-std",
@@ -4630,13 +4861,12 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "frame-system",
  "pallet-treasury",
- "parity-scale-codec 2.0.1",
- "serde",
+ "parity-scale-codec 2.1.1",
  "sp-runtime",
  "sp-std",
 ]
@@ -4644,14 +4874,13 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
- "parity-scale-codec 2.0.1",
- "serde",
+ "parity-scale-codec 2.1.1",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -4661,12 +4890,12 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "serde",
  "sp-io",
  "sp-runtime",
@@ -4676,14 +4905,13 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-election-provider-support",
  "frame-support",
  "frame-system",
  "log",
- "parity-scale-codec 2.0.1",
- "serde",
+ "parity-scale-codec 2.1.1",
  "sp-arithmetic",
  "sp-io",
  "sp-npos-elections",
@@ -4694,14 +4922,15 @@ dependencies = [
 
 [[package]]
 name = "pallet-elections-phragmen"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+version = "4.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "frame-system",
  "log",
- "parity-scale-codec 2.0.1",
- "serde",
+ "parity-scale-codec 2.1.1",
+ "sp-core",
+ "sp-io",
  "sp-npos-elections",
  "sp-runtime",
  "sp-std",
@@ -4710,15 +4939,15 @@ dependencies = [
 [[package]]
 name = "pallet-exchange"
 version = "3.0.1"
-source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=master#1ae45e9a1ca60e2d1bbc3f315403364728e71dd0"
+source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=master#f57debc4c2f8dbb174e46dd9f351e07b8314b930"
 dependencies = [
  "frame-support",
  "frame-system",
  "orml-tokens",
  "orml-traits",
- "pallet-amm",
  "pallet-asset-registry",
- "parity-scale-codec 2.0.1",
+ "pallet-xyk",
+ "parity-scale-codec 2.1.1",
  "primitive-types 0.8.0",
  "primitives",
  "serde",
@@ -4731,7 +4960,7 @@ dependencies = [
 [[package]]
 name = "pallet-exchange-benchmarking"
 version = "3.0.1"
-source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=master#1ae45e9a1ca60e2d1bbc3f315403364728e71dd0"
+source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=master#f57debc4c2f8dbb174e46dd9f351e07b8314b930"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4739,10 +4968,10 @@ dependencies = [
  "frame-system-benchmarking",
  "orml-tokens",
  "orml-traits",
- "pallet-amm",
  "pallet-asset-registry",
  "pallet-exchange",
- "parity-scale-codec 2.0.1",
+ "pallet-xyk",
+ "parity-scale-codec 2.1.1",
  "primitives",
  "sp-core",
  "sp-runtime",
@@ -4753,13 +4982,13 @@ dependencies = [
 [[package]]
 name = "pallet-faucet"
 version = "3.0.1"
-source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=master#1ae45e9a1ca60e2d1bbc3f315403364728e71dd0"
+source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=master#f57debc4c2f8dbb174e46dd9f351e07b8314b930"
 dependencies = [
  "frame-support",
  "frame-system",
  "orml-tokens",
  "orml-traits",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "primitive-types 0.7.3",
  "primitives",
  "serde",
@@ -4769,96 +4998,159 @@ dependencies = [
  "substrate-wasm-builder 3.0.0",
 ]
 
+[[package]]
+name = "pallet-gilt"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec 2.1.1",
+ "sp-arithmetic",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "pallet-grandpa"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
+ "pallet-authorship",
+ "pallet-session",
+ "parity-scale-codec 2.1.1",
+ "sp-application-crypto",
+ "sp-core",
+ "sp-finality-grandpa",
+ "sp-runtime",
+ "sp-session",
+ "sp-staking",
+ "sp-std",
+]
+
+[[package]]
+name = "pallet-identity"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
+dependencies = [
+ "enumflags2",
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec 2.1.1",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "pallet-im-online"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
  "pallet-authorship",
- "pallet-session",
- "parity-scale-codec 2.0.1",
- "serde",
+ "parity-scale-codec 2.1.1",
  "sp-application-crypto",
  "sp-core",
- "sp-finality-grandpa",
+ "sp-io",
  "sp-runtime",
- "sp-session",
  "sp-staking",
  "sp-std",
 ]
 
 [[package]]
-name = "pallet-identity"
+name = "pallet-indices"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "enumflags2",
- "frame-benchmarking",
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
- "serde",
+ "parity-scale-codec 2.1.1",
+ "sp-core",
  "sp-io",
+ "sp-keyring",
  "sp-runtime",
  "sp-std",
 ]
 
 [[package]]
-name = "pallet-im-online"
+name = "pallet-membership"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
- "pallet-authorship",
- "parity-scale-codec 2.0.1",
- "serde",
- "sp-application-crypto",
- "sp-core",
+ "parity-scale-codec 2.1.1",
  "sp-io",
  "sp-runtime",
- "sp-staking",
  "sp-std",
 ]
 
 [[package]]
-name = "pallet-indices"
+name = "pallet-mmr"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
+ "ckb-merkle-mountain-range",
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
- "serde",
+ "pallet-mmr-primitives",
+ "parity-scale-codec 2.1.1",
  "sp-core",
  "sp-io",
- "sp-keyring",
  "sp-runtime",
  "sp-std",
 ]
 
 [[package]]
-name = "pallet-membership"
+name = "pallet-mmr-primitives"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
+ "log",
+ "parity-scale-codec 2.1.1",
  "serde",
- "sp-io",
+ "sp-api",
+ "sp-core",
  "sp-runtime",
  "sp-std",
 ]
 
 [[package]]
-name = "pallet-multi-payment-benchmarking"
+name = "pallet-mmr-rpc"
 version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
+dependencies = [
+ "jsonrpc-core",
+ "jsonrpc-core-client",
+ "jsonrpc-derive",
+ "pallet-mmr-primitives",
+ "parity-scale-codec 2.1.1",
+ "serde",
+ "sp-api",
+ "sp-blockchain",
+ "sp-core",
+ "sp-rpc",
+ "sp-runtime",
+]
+
+[[package]]
+name = "pallet-multi-payment-benchmarking"
+version = "3.0.2"
+source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=master#f57debc4c2f8dbb174e46dd9f351e07b8314b930"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4868,30 +5160,27 @@ dependencies = [
  "orml-tokens",
  "orml-traits",
  "orml-utilities",
- "pallet-amm",
  "pallet-asset-registry",
  "pallet-balances",
  "pallet-transaction-multi-payment",
  "pallet-transaction-payment",
- "parity-scale-codec 2.0.1",
+ "pallet-xyk",
+ "parity-scale-codec 2.1.1",
  "primitives",
- "serde",
  "sp-core",
- "sp-io",
  "sp-runtime",
  "sp-std",
- "substrate-wasm-builder-runner",
+ "substrate-wasm-builder 3.0.0",
 ]
 
 [[package]]
 name = "pallet-multisig"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
- "serde",
+ "parity-scale-codec 2.1.1",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -4901,12 +5190,11 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
- "serde",
+ "parity-scale-codec 2.1.1",
  "sp-io",
  "sp-runtime",
  "sp-std",
@@ -4915,13 +5203,13 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "frame-system",
  "log",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "serde",
  "sp-runtime",
  "sp-staking",
@@ -4931,12 +5219,11 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
- "serde",
+ "parity-scale-codec 2.1.1",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -4946,11 +5233,11 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "safe-mix",
  "sp-runtime",
  "sp-std",
@@ -4959,13 +5246,12 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "enumflags2",
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
- "serde",
+ "parity-scale-codec 2.1.1",
  "sp-io",
  "sp-runtime",
  "sp-std",
@@ -4974,14 +5260,13 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
- "parity-scale-codec 2.0.1",
- "serde",
+ "parity-scale-codec 2.1.1",
  "sp-io",
  "sp-runtime",
  "sp-std",
@@ -4990,14 +5275,13 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
  "pallet-timestamp",
- "parity-scale-codec 2.0.1",
- "serde",
+ "parity-scale-codec 2.1.1",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5010,13 +5294,12 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "rand_chacha 0.2.2",
- "serde",
  "sp-runtime",
  "sp-std",
 ]
@@ -5024,7 +5307,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-election-provider-support",
  "frame-support",
@@ -5032,12 +5315,11 @@ dependencies = [
  "log",
  "pallet-authorship",
  "pallet-session",
- "parity-scale-codec 2.0.1",
- "paste 1.0.5",
+ "parity-scale-codec 2.1.1",
+ "paste",
  "serde",
  "sp-application-crypto",
  "sp-io",
- "sp-npos-elections",
  "sp-runtime",
  "sp-staking",
  "sp-std",
@@ -5047,7 +5329,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -5055,15 +5337,23 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "pallet-staking-reward-fn"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
+dependencies = [
+ "log",
+ "sp-arithmetic",
+]
+
 [[package]]
 name = "pallet-sudo"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
- "serde",
+ "parity-scale-codec 2.1.1",
  "sp-io",
  "sp-runtime",
  "sp-std",
@@ -5072,15 +5362,14 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
  "log",
- "parity-scale-codec 2.0.1",
- "serde",
+ "parity-scale-codec 2.1.1",
  "sp-inherents",
  "sp-io",
  "sp-runtime",
@@ -5091,12 +5380,12 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "frame-system",
  "pallet-treasury",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "serde",
  "sp-runtime",
  "sp-std",
@@ -5104,38 +5393,33 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-multi-payment"
-version = "3.0.0"
+version = "3.0.2"
+source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=master#f57debc4c2f8dbb174e46dd9f351e07b8314b930"
 dependencies = [
  "frame-support",
  "frame-system",
- "orml-currencies",
  "orml-tokens",
  "orml-traits",
  "orml-utilities",
- "pallet-amm",
- "pallet-asset-registry",
- "pallet-balances",
  "pallet-transaction-payment",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "primitive-types 0.8.0",
  "primitives",
- "serde",
  "sp-api",
  "sp-core",
- "sp-io",
  "sp-runtime",
  "sp-std",
- "substrate-wasm-builder-runner",
+ "substrate-wasm-builder 3.0.0",
 ]
 
 [[package]]
 name = "pallet-transaction-payment"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "serde",
  "smallvec 1.6.1",
  "sp-core",
@@ -5147,13 +5431,13 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
  "pallet-transaction-payment-rpc-runtime-api",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sp-api",
  "sp-blockchain",
  "sp-core",
@@ -5164,10 +5448,10 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "pallet-transaction-payment",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sp-api",
  "sp-runtime",
 ]
@@ -5175,13 +5459,13 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
  "pallet-balances",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "serde",
  "sp-runtime",
  "sp-std",
@@ -5190,12 +5474,11 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
- "serde",
+ "parity-scale-codec 2.1.1",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -5205,26 +5488,94 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "enumflags2",
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "pallet-xcm"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec 2.1.1",
+ "serde",
+ "sp-runtime",
+ "sp-std",
+ "xcm",
+ "xcm-executor",
+]
+
+[[package]]
+name = "pallet-xyk"
+version = "1.0.0"
+source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=master#f57debc4c2f8dbb174e46dd9f351e07b8314b930"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "hydra-dx-math",
+ "orml-tokens",
+ "orml-traits",
+ "orml-utilities",
+ "pallet-asset-registry",
+ "parity-scale-codec 2.1.1",
+ "primitive-types 0.8.0",
+ "primitives",
+ "serde",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
+ "substrate-wasm-builder 3.0.0",
+]
+
+[[package]]
+name = "pallet-xyk-rpc"
+version = "1.0.0"
+source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=master#f57debc4c2f8dbb174e46dd9f351e07b8314b930"
+dependencies = [
+ "jsonrpc-core",
+ "jsonrpc-core-client",
+ "jsonrpc-derive",
+ "pallet-xyk-rpc-runtime-api",
+ "parity-scale-codec 2.1.1",
+ "serde",
+ "sp-api",
+ "sp-blockchain",
+ "sp-runtime",
+ "sp-std",
+ "substrate-wasm-builder 3.0.0",
+]
+
+[[package]]
+name = "pallet-xyk-rpc-runtime-api"
+version = "3.0.0"
+source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=master#f57debc4c2f8dbb174e46dd9f351e07b8314b930"
+dependencies = [
+ "parity-scale-codec 2.1.1",
  "serde",
+ "sp-api",
  "sp-runtime",
  "sp-std",
+ "substrate-wasm-builder 3.0.0",
 ]
 
 [[package]]
 name = "parachain-info"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=rococo-v1#3a205e38e13cd254775e5cca1121f521c5f603e8"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.1#4b2c51514cd5f34a5aa0404d4a2eac86f88203f8"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "serde",
 ]
 
@@ -5260,7 +5611,7 @@ dependencies = [
  "serde",
  "static_assertions",
  "unsigned-varint 0.7.0",
- "url 2.2.1",
+ "url 2.2.2",
 ]
 
 [[package]]
@@ -5277,12 +5628,12 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "2.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cd3dab59b5cf4bc81069ade0fc470341a1ef3ad5fa73e5a8943bed2ec12b2e8"
+checksum = "e0f518afaa5a47d0d6386229b0a6e01e86427291d643aa4cabb4992219f504f8"
 dependencies = [
- "arrayvec 0.5.2",
- "bitvec 0.20.2",
+ "arrayvec 0.7.0",
+ "bitvec 0.20.4",
  "byte-slice-cast 1.0.0",
  "parity-scale-codec-derive",
  "serde",
@@ -5290,9 +5641,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa04976a81fde04924b40cc4036c4d12841e8bb04325a5cf2ada75731a150a7d"
+checksum = "f44c5f94427bd0b5076e8f7e15ca3f60a4d8ac0077e4793884e6fdfd8915344e"
 dependencies = [
  "proc-macro-crate 0.1.5",
  "proc-macro2",
@@ -5384,7 +5735,7 @@ dependencies = [
  "rand 0.7.3",
  "sha-1 0.8.2",
  "slab",
- "url 2.2.1",
+ "url 2.2.2",
 ]
 
 [[package]]
@@ -5421,7 +5772,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
 dependencies = [
  "instant",
- "lock_api 0.4.3",
+ "lock_api 0.4.4",
  "parking_lot_core 0.8.3",
 ]
 
@@ -5463,36 +5814,17 @@ dependencies = [
  "cfg-if 1.0.0",
  "instant",
  "libc",
- "redox_syscall 0.2.5",
+ "redox_syscall 0.2.8",
  "smallvec 1.6.1",
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "paste"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880"
-dependencies = [
- "paste-impl",
- "proc-macro-hack",
-]
-
 [[package]]
 name = "paste"
 version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58"
 
-[[package]]
-name = "paste-impl"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6"
-dependencies = [
- "proc-macro-hack",
-]
-
 [[package]]
 name = "pbkdf2"
 version = "0.3.0"
@@ -5600,11 +5932,11 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc174859768806e91ae575187ada95c91a29e96a98dc5d2cd9a1fed039501ba6"
+checksum = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4"
 dependencies = [
- "pin-project-internal 1.0.6",
+ "pin-project-internal 1.0.7",
 ]
 
 [[package]]
@@ -5620,9 +5952,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a490329918e856ed1b083f244e3bfe2d8c4f336407e4ea9e1a9f479ff09049e5"
+checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5662,9 +5994,9 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325"
 [[package]]
 name = "polkadot-approval-distribution"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
@@ -5676,10 +6008,9 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-bitfield-distribution"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "futures 0.3.13",
- "parity-scale-codec 2.0.1",
+ "futures 0.3.15",
  "polkadot-node-network-protocol",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
@@ -5690,11 +6021,11 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-distribution"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "lru",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "polkadot-erasure-coding",
  "polkadot-node-core-runtime-api",
  "polkadot-node-network-protocol",
@@ -5713,11 +6044,11 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-recovery"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "lru",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "polkadot-erasure-coding",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
@@ -5731,20 +6062,20 @@ dependencies = [
 
 [[package]]
 name = "polkadot-cli"
-version = "0.8.29"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
  "frame-benchmarking-cli",
- "futures 0.3.13",
+ "futures 0.3.15",
  "log",
- "polkadot-parachain",
+ "polkadot-node-core-pvf",
  "polkadot-service",
  "sc-cli",
  "sc-service",
  "sp-core",
  "sp-trie",
  "structopt",
- "substrate-build-script-utils 3.0.0 (git+https://github.com/paritytech/substrate?branch=rococo-v1)",
+ "substrate-build-script-utils 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1)",
  "thiserror",
  "try-runtime-cli",
 ]
@@ -5752,10 +6083,10 @@ dependencies = [
 [[package]]
 name = "polkadot-collator-protocol"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
  "always-assert",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
@@ -5771,10 +6102,10 @@ dependencies = [
 
 [[package]]
 name = "polkadot-core-primitives"
-version = "0.7.30"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parity-util-mem",
  "sp-core",
  "sp-runtime",
@@ -5783,10 +6114,10 @@ dependencies = [
 
 [[package]]
 name = "polkadot-erasure-coding"
-version = "0.8.29"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "polkadot-node-primitives",
  "polkadot-primitives",
  "reed-solomon-novelpoly",
@@ -5798,16 +6129,14 @@ dependencies = [
 [[package]]
 name = "polkadot-gossip-support"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "polkadot-node-network-protocol",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "sp-api",
  "sp-application-crypto",
- "sp-authority-discovery",
  "sp-keystore",
  "tracing",
 ]
@@ -5815,11 +6144,11 @@ dependencies = [
 [[package]]
 name = "polkadot-network-bridge"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
  "async-trait",
- "futures 0.3.13",
- "parity-scale-codec 2.0.1",
+ "futures 0.3.15",
+ "parity-scale-codec 2.1.1",
  "parking_lot 0.11.1",
  "polkadot-node-network-protocol",
  "polkadot-node-subsystem",
@@ -5835,15 +6164,17 @@ dependencies = [
 [[package]]
 name = "polkadot-node-collation-generation"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
+ "parity-scale-codec 2.1.1",
  "polkadot-erasure-coding",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "sp-core",
+ "sp-maybe-compressed-blob",
  "thiserror",
  "tracing",
 ]
@@ -5851,15 +6182,15 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-approval-voting"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "bitvec 0.20.2",
+ "bitvec 0.20.4",
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "kvdb",
  "merlin",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "polkadot-node-jaeger",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
@@ -5880,13 +6211,13 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-av-store"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "bitvec 0.20.2",
- "futures 0.3.13",
+ "bitvec 0.20.4",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "kvdb",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "polkadot-erasure-coding",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
@@ -5900,10 +6231,10 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-backing"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "bitvec 0.20.2",
- "futures 0.3.13",
+ "bitvec 0.20.4",
+ "futures 0.3.15",
  "polkadot-erasure-coding",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
@@ -5918,9 +6249,9 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-bitfield-signing"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
@@ -5933,9 +6264,9 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-candidate-selection"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
@@ -5948,25 +6279,27 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-candidate-validation"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "futures 0.3.13",
- "parity-scale-codec 2.0.1",
+ "async-trait",
+ "futures 0.3.15",
+ "parity-scale-codec 2.1.1",
+ "polkadot-node-core-pvf",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-parachain",
  "polkadot-primitives",
- "sp-core",
+ "sp-maybe-compressed-blob",
  "tracing",
 ]
 
 [[package]]
 name = "polkadot-node-core-chain-api"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
@@ -5975,37 +6308,30 @@ dependencies = [
 ]
 
 [[package]]
-name = "polkadot-node-core-proposer"
+name = "polkadot-node-core-parachains-inherent"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "futures 0.3.13",
+ "async-trait",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "polkadot-node-subsystem",
  "polkadot-overseer",
  "polkadot-primitives",
- "sc-basic-authorship",
- "sc-block-builder",
- "sc-client-api",
- "sc-telemetry",
- "sp-api",
  "sp-blockchain",
- "sp-consensus",
- "sp-core",
  "sp-inherents",
  "sp-runtime",
- "sp-transaction-pool",
- "substrate-prometheus-endpoint",
+ "thiserror",
  "tracing",
 ]
 
 [[package]]
 name = "polkadot-node-core-provisioner"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "bitvec 0.20.2",
- "futures 0.3.13",
+ "bitvec 0.20.4",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
@@ -6014,18 +6340,47 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "polkadot-node-core-pvf"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
+dependencies = [
+ "always-assert",
+ "assert_matches",
+ "async-process",
+ "async-std",
+ "futures 0.3.15",
+ "futures-timer 3.0.2",
+ "libc",
+ "parity-scale-codec 2.1.1",
+ "pin-project 1.0.7",
+ "polkadot-core-primitives",
+ "polkadot-parachain",
+ "rand 0.8.3",
+ "sc-executor",
+ "sc-executor-common",
+ "sc-executor-wasmtime",
+ "slotmap",
+ "sp-core",
+ "sp-externalities",
+ "sp-io",
+ "sp-wasm-interface",
+ "tracing",
+]
+
 [[package]]
 name = "polkadot-node-core-runtime-api"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "memory-lru",
  "parity-util-mem",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "sp-api",
+ "sp-authority-discovery",
  "sp-consensus-babe",
  "sp-core",
  "tracing",
@@ -6034,13 +6389,13 @@ dependencies = [
 [[package]]
 name = "polkadot-node-jaeger"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
  "async-std",
  "lazy_static",
  "log",
  "mick-jaeger",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parking_lot 0.11.1",
  "polkadot-node-primitives",
  "polkadot-primitives",
@@ -6052,10 +6407,10 @@ dependencies = [
 [[package]]
 name = "polkadot-node-network-protocol"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "futures 0.3.13",
- "parity-scale-codec 2.0.1",
+ "futures 0.3.15",
+ "parity-scale-codec 2.1.1",
  "polkadot-node-jaeger",
  "polkadot-node-primitives",
  "polkadot-primitives",
@@ -6067,10 +6422,10 @@ dependencies = [
 [[package]]
 name = "polkadot-node-primitives"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "futures 0.3.13",
- "parity-scale-codec 2.0.1",
+ "futures 0.3.15",
+ "parity-scale-codec 2.1.1",
  "polkadot-parachain",
  "polkadot-primitives",
  "polkadot-statement-table",
@@ -6080,6 +6435,7 @@ dependencies = [
  "sp-consensus-babe",
  "sp-consensus-vrf",
  "sp-core",
+ "sp-maybe-compressed-blob",
  "sp-runtime",
  "thiserror",
  "zstd",
@@ -6088,19 +6444,19 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
  "async-std",
  "async-trait",
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "lazy_static",
  "log",
  "mick-jaeger",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parking_lot 0.11.1",
- "pin-project 1.0.6",
+ "pin-project 1.0.7",
  "polkadot-node-jaeger",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
@@ -6118,14 +6474,15 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-util"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
  "async-trait",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
+ "lru",
  "metered-channel",
- "parity-scale-codec 2.0.1",
- "pin-project 1.0.6",
+ "parity-scale-codec 2.1.1",
+ "pin-project 1.0.7",
  "polkadot-node-jaeger",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
@@ -6145,55 +6502,45 @@ dependencies = [
 [[package]]
 name = "polkadot-overseer"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
  "async-trait",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
+ "polkadot-procmacro-overseer-subsystems-gen",
  "sc-client-api",
+ "sp-api",
  "tracing",
 ]
 
 [[package]]
 name = "polkadot-parachain"
-version = "0.8.29"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
  "derive_more",
- "futures 0.3.13",
- "libc",
- "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parity-util-mem",
- "parking_lot 0.11.1",
  "polkadot-core-primitives",
- "raw_sync",
- "sc-executor",
  "serde",
- "shared_memory",
  "sp-core",
- "sp-externalities",
- "sp-io",
  "sp-runtime",
  "sp-std",
- "sp-wasm-interface",
- "static_assertions",
- "thiserror",
 ]
 
 [[package]]
 name = "polkadot-primitives"
-version = "0.8.29"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "bitvec 0.20.2",
+ "bitvec 0.20.4",
  "frame-system",
  "hex-literal",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parity-util-mem",
  "polkadot-core-primitives",
  "polkadot-parachain",
@@ -6214,10 +6561,21 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "polkadot-procmacro-overseer-subsystems-gen"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
+dependencies = [
+ "assert_matches",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "polkadot-procmacro-subsystem-dispatch-gen"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
  "assert_matches",
  "proc-macro2",
@@ -6227,12 +6585,15 @@ dependencies = [
 
 [[package]]
 name = "polkadot-rpc"
-version = "0.8.29"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
+ "beefy-gadget",
+ "beefy-gadget-rpc",
  "jsonrpc-core",
+ "pallet-mmr-rpc",
  "pallet-transaction-payment-rpc",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "polkadot-primitives",
  "sc-chain-spec",
  "sc-client-api",
@@ -6257,10 +6618,11 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime"
-version = "0.8.29"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "bitvec 0.20.2",
+ "beefy-primitives",
+ "bitvec 0.20.4",
  "frame-executive",
  "frame-support",
  "frame-system",
@@ -6281,6 +6643,7 @@ dependencies = [
  "pallet-im-online",
  "pallet-indices",
  "pallet-membership",
+ "pallet-mmr-primitives",
  "pallet-multisig",
  "pallet-nicks",
  "pallet-offences",
@@ -6297,7 +6660,7 @@ dependencies = [
  "pallet-treasury",
  "pallet-utility",
  "pallet-vesting",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "polkadot-primitives",
  "polkadot-runtime-common",
  "rustc-hex",
@@ -6311,6 +6674,7 @@ dependencies = [
  "sp-core",
  "sp-inherents",
  "sp-io",
+ "sp-npos-elections",
  "sp-offchain",
  "sp-runtime",
  "sp-session",
@@ -6324,16 +6688,20 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-common"
-version = "0.8.29"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "bitvec 0.20.2",
+ "beefy-primitives",
+ "bitvec 0.20.4",
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
+ "libsecp256k1",
  "log",
  "pallet-authorship",
  "pallet-balances",
+ "pallet-beefy",
+ "pallet-mmr",
  "pallet-offences",
  "pallet-session",
  "pallet-staking",
@@ -6341,12 +6709,13 @@ dependencies = [
  "pallet-transaction-payment",
  "pallet-treasury",
  "pallet-vesting",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "polkadot-primitives",
  "polkadot-runtime-parachains",
  "rustc-hex",
  "serde",
  "serde_derive",
+ "slot-range-helper",
  "sp-api",
  "sp-core",
  "sp-inherents",
@@ -6361,10 +6730,10 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-parachains"
-version = "0.8.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "bitvec 0.20.2",
+ "bitvec 0.20.4",
  "derive_more",
  "frame-support",
  "frame-system",
@@ -6377,7 +6746,7 @@ dependencies = [
  "pallet-staking",
  "pallet-timestamp",
  "pallet-vesting",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "polkadot-primitives",
  "rand 0.8.3",
  "rand_chacha 0.3.0",
@@ -6398,18 +6767,21 @@ dependencies = [
 
 [[package]]
 name = "polkadot-service"
-version = "0.8.3"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
+ "beefy-gadget",
+ "beefy-primitives",
  "frame-benchmarking",
  "frame-system-rpc-runtime-api",
- "futures 0.3.13",
+ "futures 0.3.15",
  "hex-literal",
  "kusama-runtime",
  "kvdb",
  "kvdb-rocksdb",
  "pallet-babe",
  "pallet-im-online",
+ "pallet-mmr-primitives",
  "pallet-staking",
  "pallet-transaction-payment-rpc-runtime-api",
  "polkadot-approval-distribution",
@@ -6427,7 +6799,7 @@ dependencies = [
  "polkadot-node-core-candidate-selection",
  "polkadot-node-core-candidate-validation",
  "polkadot-node-core-chain-api",
- "polkadot-node-core-proposer",
+ "polkadot-node-core-parachains-inherent",
  "polkadot-node-core-provisioner",
  "polkadot-node-core-runtime-api",
  "polkadot-node-primitives",
@@ -6442,6 +6814,7 @@ dependencies = [
  "polkadot-statement-distribution",
  "rococo-runtime",
  "sc-authority-discovery",
+ "sc-basic-authorship",
  "sc-block-builder",
  "sc-chain-spec",
  "sc-client-api",
@@ -6449,6 +6822,7 @@ dependencies = [
  "sc-consensus",
  "sc-consensus-babe",
  "sc-consensus-slots",
+ "sc-consensus-uncles",
  "sc-executor",
  "sc-finality-grandpa",
  "sc-finality-grandpa-warp-sync",
@@ -6474,6 +6848,7 @@ dependencies = [
  "sp-session",
  "sp-state-machine",
  "sp-storage",
+ "sp-timestamp",
  "sp-transaction-pool",
  "sp-trie",
  "substrate-prometheus-endpoint",
@@ -6485,36 +6860,40 @@ dependencies = [
 [[package]]
 name = "polkadot-statement-distribution"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
  "arrayvec 0.5.2",
- "futures 0.3.13",
+ "futures 0.3.15",
  "indexmap",
+ "parity-scale-codec 2.1.1",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
+ "sc-network",
+ "sp-keystore",
  "sp-staking",
+ "thiserror",
  "tracing",
 ]
 
 [[package]]
 name = "polkadot-statement-table"
-version = "0.8.29"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "polkadot-primitives",
  "sp-core",
 ]
 
 [[package]]
 name = "polkadot-test-client"
-version = "0.8.29"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "polkadot-node-subsystem",
  "polkadot-primitives",
  "polkadot-test-runtime",
@@ -6536,10 +6915,11 @@ dependencies = [
 
 [[package]]
 name = "polkadot-test-runtime"
-version = "0.8.29"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "bitvec 0.20.2",
+ "beefy-primitives",
+ "bitvec 0.20.4",
  "frame-election-provider-support",
  "frame-executive",
  "frame-support",
@@ -6552,6 +6932,7 @@ dependencies = [
  "pallet-balances",
  "pallet-grandpa",
  "pallet-indices",
+ "pallet-mmr-primitives",
  "pallet-nicks",
  "pallet-offences",
  "pallet-randomness-collective-flip",
@@ -6563,7 +6944,7 @@ dependencies = [
  "pallet-transaction-payment",
  "pallet-transaction-payment-rpc-runtime-api",
  "pallet-vesting",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "polkadot-parachain",
  "polkadot-primitives",
  "polkadot-runtime-common",
@@ -6591,13 +6972,13 @@ dependencies = [
 
 [[package]]
 name = "polkadot-test-service"
-version = "0.8.29"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
  "frame-benchmarking",
  "frame-system",
  "futures 0.1.31",
- "futures 0.3.13",
+ "futures 0.3.15",
  "hex",
  "pallet-balances",
  "pallet-staking",
@@ -6660,7 +7041,7 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b7456bc1ad2d4cf82b3a016be4c2ac48daf11bf990c1603ebd447fe6f30fca8"
 dependencies = [
- "cpuid-bool 0.2.0",
+ "cpuid-bool",
  "universal-hash",
 ]
 
@@ -6670,7 +7051,7 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd"
 dependencies = [
- "cpuid-bool 0.2.0",
+ "cpuid-bool",
  "opaque-debug 0.3.0",
  "universal-hash",
 ]
@@ -6718,11 +7099,11 @@ dependencies = [
 [[package]]
 name = "primitives"
 version = "3.0.0"
-source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=master#1ae45e9a1ca60e2d1bbc3f315403364728e71dd0"
+source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=master#f57debc4c2f8dbb174e46dd9f351e07b8314b930"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "primitive-types 0.8.0",
  "serde",
  "sp-std",
@@ -6833,7 +7214,7 @@ dependencies = [
  "prost",
  "prost-types",
  "tempfile",
- "which 4.1.0",
+ "which",
 ]
 
 [[package]]
@@ -6887,9 +7268,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quick-error"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ac73b1112776fc109b2e61909bc46c7e1bf0d7f690ffb1676553acce16d5cda"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quicksink"
@@ -7061,30 +7442,6 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
-[[package]]
-name = "raw-cpuid"
-version = "8.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fdf7d9dbd43f3d81d94a49c1c3df73cc2b3827995147e6cf7f89d4ec5483e73"
-dependencies = [
- "bitflags",
- "cc",
- "rustc_version",
-]
-
-[[package]]
-name = "raw_sync"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a34bde3561f980a51c70495164200569a11662644fe5af017f0b5d7015688cc"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "nix",
- "rand 0.8.3",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "rawpointer"
 version = "0.2.1"
@@ -7093,9 +7450,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
 
 [[package]]
 name = "rayon"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
+checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
 dependencies = [
  "autocfg",
  "crossbeam-deque 0.8.0",
@@ -7105,13 +7462,13 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.9.0"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
+checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque 0.8.0",
- "crossbeam-utils 0.8.3",
+ "crossbeam-utils 0.8.4",
  "lazy_static",
  "num_cpus",
 ]
@@ -7133,24 +7490,13 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.5"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
+checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc"
 dependencies = [
  "bitflags",
 ]
 
-[[package]]
-name = "redox_users"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
-dependencies = [
- "getrandom 0.1.16",
- "redox_syscall 0.1.57",
- "rust-argon2",
-]
-
 [[package]]
 name = "redox_users"
 version = "0.4.0"
@@ -7158,14 +7504,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
 dependencies = [
  "getrandom 0.2.2",
- "redox_syscall 0.2.5",
+ "redox_syscall 0.2.8",
 ]
 
 [[package]]
 name = "reed-solomon-novelpoly"
-version = "0.0.3"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f11e01a8ef53ec033daf53a9385a1d0bb266155797919096e4134118f45efe82"
+checksum = "3bd8f48b2066e9f69ab192797d66da804d1935bf22763204ed3675740cb0f221"
 dependencies = [
  "derive_more",
  "fs-err",
@@ -7202,14 +7548,15 @@ checksum = "571f7f397d61c4755285cd37853fe8e03271c243424a907415909379659381c5"
 dependencies = [
  "log",
  "rustc-hash",
+ "serde",
  "smallvec 1.6.1",
 ]
 
 [[package]]
 name = "regex"
-version = "1.4.5"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19"
+checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -7228,9 +7575,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.23"
+version = "0.6.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
 [[package]]
 name = "region"
@@ -7247,15 +7594,14 @@ dependencies = [
 [[package]]
 name = "remote-externalities"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "env_logger 0.8.3",
  "hex-literal",
  "jsonrpsee-http-client",
  "jsonrpsee-proc-macros",
- "jsonrpsee-types",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -7270,11 +7616,21 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "resolv-conf"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
+dependencies = [
+ "hostname",
+ "quick-error 1.2.3",
+]
+
 [[package]]
 name = "retain_mut"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53552c6c49e1e13f1a203ef0080ab3bbef0beb570a528993e83df057a9d9bba1"
+checksum = "e9c17925a9027d298a4603d286befe3f9dc0e8ed02523141914eb628798d6e5b"
 
 [[package]]
 name = "ring"
@@ -7303,9 +7659,9 @@ dependencies = [
 
 [[package]]
 name = "rocksdb"
-version = "0.15.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d83c02c429044d58474eaf5ae31e062d0de894e21125b47437ec0edc1397e6"
+checksum = "c749134fda8bfc90d0de643d59bfc841dcb3ac8a1062e12b6754bd60235c48b3"
 dependencies = [
  "libc",
  "librocksdb-sys",
@@ -7313,9 +7669,10 @@ dependencies = [
 
 [[package]]
 name = "rococo-runtime"
-version = "0.8.29"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
+ "beefy-primitives",
  "frame-executive",
  "frame-support",
  "frame-system",
@@ -7326,9 +7683,14 @@ dependencies = [
  "pallet-authorship",
  "pallet-babe",
  "pallet-balances",
+ "pallet-beefy",
+ "pallet-collective",
  "pallet-grandpa",
  "pallet-im-online",
  "pallet-indices",
+ "pallet-membership",
+ "pallet-mmr",
+ "pallet-mmr-primitives",
  "pallet-offences",
  "pallet-proxy",
  "pallet-session",
@@ -7339,7 +7701,8 @@ dependencies = [
  "pallet-transaction-payment",
  "pallet-transaction-payment-rpc-runtime-api",
  "pallet-utility",
- "parity-scale-codec 2.0.1",
+ "pallet-xcm",
+ "parity-scale-codec 2.1.1",
  "polkadot-parachain",
  "polkadot-primitives",
  "polkadot-runtime-common",
@@ -7377,23 +7740,11 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "rust-argon2"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
-dependencies = [
- "base64 0.13.0",
- "blake2b_simd",
- "constant_time_eq",
- "crossbeam-utils 0.8.3",
-]
-
 [[package]]
 name = "rustc-demangle"
-version = "0.1.18"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
+checksum = "410f7acf3cb3a44527c5d9546bad4bf4e6c460915d5f9f2fc524498bfe8f70ce"
 
 [[package]]
 name = "rustc-hash"
@@ -7431,9 +7782,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.19.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "064fd21ff87c6e87ed4506e68beb42459caa4a0e2eb144932e6776768556980b"
+checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
 dependencies = [
  "base64 0.13.0",
  "log",
@@ -7454,13 +7805,23 @@ dependencies = [
  "security-framework",
 ]
 
+[[package]]
+name = "ruzstd"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d425143485a37727c7a46e689bbe3b883a00f42b4a52c4ac0f44855c1009b00"
+dependencies = [
+ "byteorder",
+ "twox-hash",
+]
+
 [[package]]
 name = "rw-stream-sink"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "pin-project 0.4.28",
  "static_assertions",
 ]
@@ -7501,16 +7862,17 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "async-trait",
  "derive_more",
  "either",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
+ "ip_network",
  "libp2p",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "prost",
  "prost-build",
  "rand 0.7.3",
@@ -7529,12 +7891,12 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sc-block-builder",
  "sc-client-api",
  "sc-proposer-metrics",
@@ -7552,9 +7914,9 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sc-client-api",
  "sp-api",
  "sp-block-builder",
@@ -7568,10 +7930,10 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "impl-trait-for-tuples",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sc-chain-spec-derive",
  "sc-consensus-babe",
  "sc-consensus-epochs",
@@ -7589,7 +7951,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -7600,16 +7962,16 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "chrono",
  "fdlimit",
- "futures 0.3.13",
+ "futures 0.3.15",
  "hex",
  "libp2p",
  "log",
  "names",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "rand 0.7.3",
  "regex",
  "rpassword",
@@ -7638,16 +8000,16 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "derive_more",
  "fnv",
- "futures 0.3.13",
+ "futures 0.3.15",
  "hash-db",
  "kvdb",
  "lazy_static",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parking_lot 0.11.1",
  "sc-executor",
  "sp-api",
@@ -7672,7 +8034,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -7682,7 +8044,7 @@ dependencies = [
  "linked-hash-map",
  "log",
  "parity-db",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parity-util-mem",
  "parking_lot 0.11.1",
  "sc-client-api",
@@ -7702,8 +8064,9 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
+ "parking_lot 0.11.1",
  "sc-client-api",
  "sp-blockchain",
  "sp-consensus",
@@ -7713,14 +8076,14 @@ dependencies = [
 [[package]]
 name = "sc-consensus-aura"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
+ "async-trait",
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "log",
- "parity-scale-codec 2.0.1",
- "parking_lot 0.11.1",
+ "parity-scale-codec 2.1.1",
  "sc-block-builder",
  "sc-client-api",
  "sc-consensus-slots",
@@ -7737,7 +8100,6 @@ dependencies = [
  "sp-io",
  "sp-keystore",
  "sp-runtime",
- "sp-timestamp",
  "sp-version",
  "substrate-prometheus-endpoint",
 ]
@@ -7745,18 +8107,19 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
+ "async-trait",
  "derive_more",
  "fork-tree",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "log",
  "merlin",
  "num-bigint",
- "num-rational",
+ "num-rational 0.2.4",
  "num-traits",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parking_lot 0.11.1",
  "pdqselect",
  "rand 0.7.3",
@@ -7782,7 +8145,6 @@ dependencies = [
  "sp-io",
  "sp-keystore",
  "sp-runtime",
- "sp-timestamp",
  "sp-utils",
  "sp-version",
  "substrate-prometheus-endpoint",
@@ -7791,10 +8153,10 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
@@ -7815,12 +8177,12 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "fork-tree",
- "parity-scale-codec 2.0.1",
- "parking_lot 0.11.1",
+ "parity-scale-codec 2.1.1",
  "sc-client-api",
+ "sc-consensus",
  "sp-blockchain",
  "sp-runtime",
 ]
@@ -7828,13 +8190,14 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "futures 0.3.13",
+ "async-trait",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
+ "impl-trait-for-tuples",
  "log",
- "parity-scale-codec 2.0.1",
- "parking_lot 0.11.1",
+ "parity-scale-codec 2.1.1",
  "sc-client-api",
  "sc-telemetry",
  "sp-api",
@@ -7855,27 +8218,24 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "log",
  "sc-client-api",
  "sp-authorship",
- "sp-consensus",
- "sp-core",
- "sp-inherents",
  "sp-runtime",
+ "thiserror",
 ]
 
 [[package]]
 name = "sc-executor"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "derive_more",
  "lazy_static",
  "libsecp256k1",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parity-wasm 0.41.0",
  "parking_lot 0.11.1",
  "sc-executor-common",
@@ -7885,6 +8245,7 @@ dependencies = [
  "sp-core",
  "sp-externalities",
  "sp-io",
+ "sp-maybe-compressed-blob",
  "sp-panic-handler",
  "sp-runtime-interface",
  "sp-serializer",
@@ -7898,11 +8259,12 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "derive_more",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parity-wasm 0.41.0",
+ "pwasm-utils",
  "sp-allocator",
  "sp-core",
  "sp-serializer",
@@ -7914,10 +8276,10 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sc-executor-common",
  "sp-allocator",
  "sp-core",
@@ -7929,10 +8291,10 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parity-wasm 0.41.0",
  "pwasm-utils",
  "sc-executor-common",
@@ -7947,19 +8309,20 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
+ "async-trait",
  "derive_more",
  "dyn-clone",
  "finality-grandpa",
  "fork-tree",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "linked-hash-map",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parking_lot 0.11.1",
- "pin-project 1.0.6",
+ "pin-project 1.0.7",
  "rand 0.7.3",
  "sc-block-builder",
  "sc-client-api",
@@ -7986,17 +8349,17 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "derive_more",
  "finality-grandpa",
- "futures 0.3.13",
+ "futures 0.3.15",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
  "jsonrpc-pubsub",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sc-client-api",
  "sc-finality-grandpa",
  "sc-rpc",
@@ -8010,13 +8373,13 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-warp-sync"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "log",
  "num-traits",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parking_lot 0.11.1",
  "prost",
  "sc-client-api",
@@ -8031,10 +8394,10 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "ansi_term 0.12.1",
- "futures 0.3.13",
+ "futures 0.3.15",
  "log",
  "parity-util-mem",
  "sc-client-api",
@@ -8049,11 +8412,11 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "async-trait",
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-util",
  "hex",
  "merlin",
@@ -8069,11 +8432,11 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "hash-db",
  "lazy_static",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parking_lot 0.11.1",
  "sc-client-api",
  "sc-executor",
@@ -8088,7 +8451,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "async-std",
  "async-trait",
@@ -8102,7 +8465,7 @@ dependencies = [
  "erased-serde",
  "fnv",
  "fork-tree",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "hex",
  "ip_network",
@@ -8112,9 +8475,9 @@ dependencies = [
  "log",
  "lru",
  "nohash-hasher",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parking_lot 0.11.1",
- "pin-project 1.0.6",
+ "pin-project 1.0.7",
  "prost",
  "prost-build",
  "rand 0.7.3",
@@ -8141,9 +8504,9 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
@@ -8158,18 +8521,18 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "hex",
  "hyper 0.13.10",
  "hyper-rustls",
  "log",
  "num_cpus",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parking_lot 0.11.1",
  "rand 0.7.3",
  "sc-client-api",
@@ -8186,9 +8549,9 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p",
  "log",
  "serde_json",
@@ -8199,7 +8562,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -8208,14 +8571,14 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "hash-db",
  "jsonrpc-core",
  "jsonrpc-pubsub",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parking_lot 0.11.1",
  "sc-block-builder",
  "sc-client-api",
@@ -8234,6 +8597,7 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-state-machine",
+ "sp-tracing",
  "sp-transaction-pool",
  "sp-utils",
  "sp-version",
@@ -8242,16 +8606,16 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
  "jsonrpc-pubsub",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parking_lot 0.11.1",
  "serde",
  "serde_json",
@@ -8259,6 +8623,7 @@ dependencies = [
  "sp-core",
  "sp-rpc",
  "sp-runtime",
+ "sp-tracing",
  "sp-transaction-pool",
  "sp-version",
 ]
@@ -8266,7 +8631,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "futures 0.1.31",
  "jsonrpc-core",
@@ -8284,22 +8649,23 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
+ "async-trait",
  "directories",
  "exit-future",
  "futures 0.1.31",
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "hash-db",
  "jsonrpc-core",
  "jsonrpc-pubsub",
  "lazy_static",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parity-util-mem",
  "parking_lot 0.11.1",
- "pin-project 1.0.6",
+ "pin-project 1.0.7",
  "rand 0.7.3",
  "sc-block-builder",
  "sc-chain-spec",
@@ -8347,10 +8713,10 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parity-util-mem",
  "parity-util-mem-derive",
  "parking_lot 0.11.1",
@@ -8362,7 +8728,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -8382,14 +8748,14 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "chrono",
- "futures 0.3.13",
+ "futures 0.3.15",
  "libp2p",
  "log",
  "parking_lot 0.11.1",
- "pin-project 1.0.6",
+ "pin-project 1.0.7",
  "rand 0.7.3",
  "serde",
  "serde_json",
@@ -8402,7 +8768,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -8413,23 +8779,33 @@ dependencies = [
  "parking_lot 0.11.1",
  "regex",
  "rustc-hash",
+ "sc-client-api",
+ "sc-rpc-server",
+ "sc-telemetry",
  "sc-tracing-proc-macro",
  "serde",
  "serde_json",
+ "sp-api",
+ "sp-block-builder",
+ "sp-blockchain",
+ "sp-core",
+ "sp-rpc",
+ "sp-runtime",
+ "sp-storage",
  "sp-tracing",
  "thiserror",
  "tracing",
- "tracing-core",
  "tracing-log",
  "tracing-subscriber",
  "wasm-bindgen",
+ "wasm-timer",
  "web-sys",
 ]
 
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -8440,10 +8816,10 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "linked-hash-map",
  "log",
  "parity-util-mem",
@@ -8462,13 +8838,13 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-diagnose",
  "intervalier",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parity-util-mem",
  "parking_lot 0.11.1",
  "sc-client-api",
@@ -8548,9 +8924,9 @@ dependencies = [
 
 [[package]]
 name = "sct"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
+checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
 dependencies = [
  "ring",
  "untrusted",
@@ -8633,18 +9009,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.125"
+version = "1.0.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
+checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.125"
+version = "1.0.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
+checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8676,13 +9052,13 @@ dependencies = [
 
 [[package]]
 name = "sha-1"
-version = "0.9.4"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfebf75d25bd900fd1e7d11501efab59bc846dbc76196839663e6637bba9f25f"
+checksum = "8c4cfa741c5832d0ef7fab46cabed29c2aae926db0b11bb2069edd8db5e64e16"
 dependencies = [
  "block-buffer 0.9.0",
  "cfg-if 1.0.0",
- "cpuid-bool 0.1.2",
+ "cpufeatures",
  "digest 0.9.0",
  "opaque-debug 0.3.0",
 ]
@@ -8701,13 +9077,13 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.9.3"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de"
+checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12"
 dependencies = [
  "block-buffer 0.9.0",
  "cfg-if 1.0.0",
- "cpuid-bool 0.1.2",
+ "cpufeatures",
  "digest 0.9.0",
  "opaque-debug 0.3.0",
 ]
@@ -8733,20 +9109,6 @@ dependencies = [
  "lazy_static",
 ]
 
-[[package]]
-name = "shared_memory"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b854a362375dfe8ab12ea8a98228040d37293c988f85fbac9fa0f83336387966"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "nix",
- "quick-error 2.0.0",
- "rand 0.8.3",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "shlex"
 version = "0.1.1"
@@ -8780,21 +9142,51 @@ checksum = "0f0242b8e50dd9accdd56170e94ca1ebd223b098eb9c83539a6e367d0f36ae68"
 
 [[package]]
 name = "simba"
-version = "0.1.5"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb931b1367faadea6b1ab1c306a860ec17aaa5fa39f367d0c744e69d971a1fb2"
+checksum = "5132a955559188f3d13c9ba831e77c802ddc8782783f050ed0c52f5988b95f4c"
 dependencies = [
- "approx",
- "num-complex",
+ "approx 0.4.0",
+ "num-complex 0.3.1",
  "num-traits",
- "paste 0.1.18",
+ "paste",
 ]
 
 [[package]]
 name = "slab"
-version = "0.4.2"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527"
+
+[[package]]
+name = "slog"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06"
+dependencies = [
+ "erased-serde",
+]
+
+[[package]]
+name = "slot-range-helper"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
+dependencies = [
+ "enumn",
+ "parity-scale-codec 2.1.1",
+ "paste",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "slotmap"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+checksum = "585cd5dffe4e9e06f6dfdf66708b70aca3f781bed561f4f667b2d9c0d4559e36"
+dependencies = [
+ "version_check",
+]
 
 [[package]]
 name = "smallvec"
@@ -8824,7 +9216,7 @@ dependencies = [
  "rand_core 0.5.1",
  "ring",
  "rustc_version",
- "sha2 0.9.3",
+ "sha2 0.9.5",
  "subtle 2.4.0",
  "x25519-dalek",
 ]
@@ -8859,17 +9251,17 @@ dependencies = [
  "base64 0.12.3",
  "bytes 0.5.6",
  "flate2",
- "futures 0.3.13",
+ "futures 0.3.15",
  "httparse",
  "log",
  "rand 0.7.3",
- "sha-1 0.9.4",
+ "sha-1 0.9.6",
 ]
 
 [[package]]
 name = "sp-allocator"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "log",
  "sp-core",
@@ -8881,11 +9273,11 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "hash-db",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sp-api-proc-macro",
  "sp-core",
  "sp-runtime",
@@ -8898,7 +9290,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate 1.0.0",
@@ -8910,9 +9302,9 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "serde",
  "sp-core",
  "sp-io",
@@ -8922,22 +9314,23 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "integer-sqrt",
  "num-traits",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "serde",
  "sp-debug-derive",
  "sp-std",
+ "static_assertions",
 ]
 
 [[package]]
 name = "sp-authority-discovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sp-api",
  "sp-application-crypto",
  "sp-runtime",
@@ -8947,9 +9340,10 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "async-trait",
+ "parity-scale-codec 2.1.1",
  "sp-inherents",
  "sp-runtime",
  "sp-std",
@@ -8958,9 +9352,9 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sp-api",
  "sp-inherents",
  "sp-runtime",
@@ -8970,12 +9364,12 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "log",
  "lru",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parking_lot 0.11.1",
  "sp-api",
  "sp-consensus",
@@ -8988,7 +9382,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "serde",
  "serde_json",
@@ -8997,13 +9391,14 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "futures 0.3.13",
+ "async-trait",
+ "futures 0.3.15",
  "futures-timer 3.0.2",
  "libp2p",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parking_lot 0.11.1",
  "serde",
  "sp-api",
@@ -9023,9 +9418,10 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "async-trait",
+ "parity-scale-codec 2.1.1",
  "sp-api",
  "sp-application-crypto",
  "sp-consensus",
@@ -9039,10 +9435,11 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
+ "async-trait",
  "merlin",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "serde",
  "sp-api",
  "sp-application-crypto",
@@ -9060,9 +9457,9 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sp-arithmetic",
  "sp-runtime",
 ]
@@ -9070,9 +9467,9 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "schnorrkel",
  "sp-core",
  "sp-runtime",
@@ -9082,14 +9479,14 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "base58",
  "blake2-rfc",
  "byteorder",
  "dyn-clonable",
  "ed25519-dalek",
- "futures 0.3.13",
+ "futures 0.3.15",
  "hash-db",
  "hash256-std-hasher",
  "hex",
@@ -9099,7 +9496,7 @@ dependencies = [
  "log",
  "merlin",
  "num-traits",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parity-util-mem",
  "parking_lot 0.11.1",
  "primitive-types 0.9.0",
@@ -9108,7 +9505,7 @@ dependencies = [
  "schnorrkel",
  "secrecy",
  "serde",
- "sha2 0.9.3",
+ "sha2 0.9.5",
  "sp-debug-derive",
  "sp-externalities",
  "sp-runtime-interface",
@@ -9126,7 +9523,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -9135,7 +9532,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9145,10 +9542,10 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "environmental",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sp-std",
  "sp-storage",
 ]
@@ -9156,11 +9553,11 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "finality-grandpa",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "serde",
  "sp-api",
  "sp-application-crypto",
@@ -9173,11 +9570,13 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "parity-scale-codec 2.0.1",
- "parking_lot 0.11.1",
+ "async-trait",
+ "impl-trait-for-tuples",
+ "parity-scale-codec 2.1.1",
  "sp-core",
+ "sp-runtime",
  "sp-std",
  "thiserror",
 ]
@@ -9185,13 +9584,13 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "hash-db",
  "libsecp256k1",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parking_lot 0.11.1",
  "sp-core",
  "sp-externalities",
@@ -9209,7 +9608,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -9220,13 +9619,13 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "async-trait",
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "merlin",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parking_lot 0.11.1",
  "schnorrkel",
  "serde",
@@ -9234,12 +9633,21 @@ dependencies = [
  "sp-externalities",
 ]
 
+[[package]]
+name = "sp-maybe-compressed-blob"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
+dependencies = [
+ "ruzstd",
+ "zstd",
+]
+
 [[package]]
 name = "sp-npos-elections"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "serde",
  "sp-arithmetic",
  "sp-core",
@@ -9250,7 +9658,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -9261,7 +9669,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -9271,7 +9679,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "backtrace",
 ]
@@ -9279,24 +9687,26 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
+ "rustc-hash",
  "serde",
  "sp-core",
+ "tracing-core",
 ]
 
 [[package]]
 name = "sp-runtime"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "either",
  "hash256-std-hasher",
  "impl-trait-for-tuples",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parity-util-mem",
- "paste 1.0.5",
+ "paste",
  "rand 0.7.3",
  "serde",
  "sp-application-crypto",
@@ -9309,10 +9719,10 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "impl-trait-for-tuples",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "primitive-types 0.9.0",
  "sp-externalities",
  "sp-runtime-interface-proc-macro",
@@ -9326,7 +9736,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.0.0",
@@ -9338,7 +9748,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "serde",
  "serde_json",
@@ -9347,9 +9757,9 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sp-api",
  "sp-core",
  "sp-runtime",
@@ -9360,9 +9770,9 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sp-runtime",
  "sp-std",
 ]
@@ -9370,12 +9780,12 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "hash-db",
  "log",
  "num-traits",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parking_lot 0.11.1",
  "rand 0.7.3",
  "smallvec 1.6.1",
@@ -9385,6 +9795,7 @@ dependencies = [
  "sp-std",
  "sp-trie",
  "thiserror",
+ "tracing",
  "trie-db",
  "trie-root",
 ]
@@ -9392,15 +9803,15 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 
 [[package]]
 name = "sp-storage"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "impl-serde",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "ref-cast",
  "serde",
  "sp-debug-derive",
@@ -9410,7 +9821,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "log",
  "sp-core",
@@ -9423,23 +9834,32 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "async-trait",
+ "futures-timer 3.0.2",
+ "log",
+ "parity-scale-codec 2.1.1",
  "sp-api",
  "sp-inherents",
  "sp-runtime",
  "sp-std",
+ "thiserror",
  "wasm-timer",
 ]
 
 [[package]]
 name = "sp-tracing"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
+ "erased-serde",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
+ "parking_lot 0.10.2",
+ "serde",
+ "serde_json",
+ "slog",
  "sp-std",
  "tracing",
  "tracing-core",
@@ -9449,12 +9869,12 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "derive_more",
- "futures 0.3.13",
+ "futures 0.3.15",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "serde",
  "sp-api",
  "sp-blockchain",
@@ -9465,11 +9885,11 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "hash-db",
  "memory-db",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sp-core",
  "sp-std",
  "trie-db",
@@ -9479,9 +9899,9 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "futures-core",
  "futures-timer 3.0.2",
  "lazy_static",
@@ -9491,10 +9911,10 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "impl-serde",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "serde",
  "sp-runtime",
  "sp-std",
@@ -9503,10 +9923,10 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "impl-trait-for-tuples",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sp-std",
  "wasmi",
 ]
@@ -9556,10 +9976,11 @@ dependencies = [
 
 [[package]]
 name = "statrs"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cce16f6de653e88beca7bd13780d08e09d4489dbca1f9210e041bc4852481382"
+checksum = "1e34b58a8f9b7462b6922e0b4e3c83d1b3c2075f7f996a56d6c66afa81590064"
 dependencies = [
+ "nalgebra 0.19.0",
  "rand 0.7.3",
 ]
 
@@ -9661,7 +10082,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "platforms",
 ]
@@ -9680,22 +10101,22 @@ name = "substrate-fixed"
 version = "0.5.6"
 source = "git+https://github.com/encointer/substrate-fixed#b33d186888c60f38adafcfc0ec3a21aab263aef1"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "typenum",
 ]
 
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-system-rpc-runtime-api",
- "futures 0.3.13",
+ "futures 0.3.15",
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sc-client-api",
  "sc-rpc-api",
  "serde",
@@ -9710,7 +10131,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "async-std",
  "derive_more",
@@ -9724,13 +10145,14 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
+ "async-trait",
  "futures 0.1.31",
- "futures 0.3.13",
+ "futures 0.3.15",
  "hash-db",
  "hex",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sc-client-api",
  "sc-client-db",
  "sc-consensus",
@@ -9752,7 +10174,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "cfg-if 1.0.0",
  "frame-support",
@@ -9762,7 +10184,7 @@ dependencies = [
  "memory-db",
  "pallet-babe",
  "pallet-timestamp",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "parity-util-mem",
  "sc-service",
  "serde",
@@ -9793,10 +10215,10 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime-client"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
- "futures 0.3.13",
- "parity-scale-codec 2.0.1",
+ "futures 0.3.15",
+ "parity-scale-codec 2.1.1",
  "sc-block-builder",
  "sc-client-api",
  "sc-consensus",
@@ -9820,7 +10242,7 @@ dependencies = [
  "ansi_term 0.12.1",
  "atty",
  "build-helper",
- "cargo_metadata",
+ "cargo_metadata 0.12.3",
  "tempfile",
  "toml",
  "walkdir",
@@ -9830,24 +10252,19 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
  "build-helper",
- "cargo_metadata",
+ "cargo_metadata 0.13.1",
+ "sp-maybe-compressed-blob",
  "tempfile",
  "toml",
  "walkdir",
  "wasm-gc-api",
 ]
 
-[[package]]
-name = "substrate-wasm-builder-runner"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2a965994514ab35d3893e9260245f2947fd1981cdd4fffd2c6e6d1a9ce02e6a"
-
 [[package]]
 name = "subtle"
 version = "1.0.0"
@@ -9862,9 +10279,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
 
 [[package]]
 name = "syn"
-version = "1.0.68"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ce15dd3ed8aa2f8eeac4716d6ef5ab58b6b9256db41d7e1a0224c2788e8fd87"
+checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9910,7 +10327,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "libc",
  "rand 0.8.3",
- "redox_syscall 0.2.5",
+ "redox_syscall 0.2.8",
  "remove_dir_all",
  "winapi 0.3.9",
 ]
@@ -10007,7 +10424,7 @@ dependencies = [
  "pbkdf2 0.4.0",
  "rand 0.7.3",
  "rustc-hash",
- "sha2 0.9.3",
+ "sha2 0.9.5",
  "thiserror",
  "unicode-normalization",
  "zeroize",
@@ -10317,9 +10734,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.25"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f"
+checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
 dependencies = [
  "cfg-if 1.0.0",
  "log",
@@ -10341,9 +10758,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f"
+checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052"
 dependencies = [
  "lazy_static",
 ]
@@ -10354,7 +10771,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
 dependencies = [
- "pin-project 1.0.6",
+ "pin-project 1.0.7",
  "tracing",
 ]
 
@@ -10381,9 +10798,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.2.17"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "705096c6f83bf68ea5d357a6aa01829ddbdac531b357b45abeca842938085baa"
+checksum = "aa5553bf0883ba7c9cbe493b085c29926bd41b66afc31ff72cf17ff4fb60dcd5"
 dependencies = [
  "ansi_term 0.12.1",
  "chrono",
@@ -10423,6 +10840,49 @@ dependencies = [
  "hash-db",
 ]
 
+[[package]]
+name = "trust-dns-proto"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0d7f5db438199a6e2609debe3f69f808d074e0a2888ee0bccb45fe234d03f4"
+dependencies = [
+ "async-trait",
+ "cfg-if 1.0.0",
+ "data-encoding",
+ "enum-as-inner",
+ "futures-channel",
+ "futures-io",
+ "futures-util",
+ "idna 0.2.3",
+ "ipnet",
+ "lazy_static",
+ "log",
+ "rand 0.8.3",
+ "smallvec 1.6.1",
+ "thiserror",
+ "tinyvec",
+ "url 2.2.2",
+]
+
+[[package]]
+name = "trust-dns-resolver"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6ad17b608a64bd0735e67bde16b0636f8aa8591f831a25d18443ed00a699770"
+dependencies = [
+ "cfg-if 1.0.0",
+ "futures-util",
+ "ipconfig",
+ "lazy_static",
+ "log",
+ "lru-cache",
+ "parking_lot 0.11.1",
+ "resolv-conf",
+ "smallvec 1.6.1",
+ "thiserror",
+ "trust-dns-proto",
+]
+
 [[package]]
 name = "try-lock"
 version = "0.2.3"
@@ -10432,11 +10892,11 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 [[package]]
 name = "try-runtime-cli"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#e3919c69bf3a5f4720c0103d0a67c3bdb52b86d0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.1#3f110196163b5ec03bac5ee188d60bedf3ebd91d"
 dependencies = [
  "frame-try-runtime",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "remote-externalities",
  "sc-cli",
  "sc-client-api",
@@ -10509,9 +10969,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
+checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0"
 dependencies = [
  "matches",
 ]
@@ -10539,9 +10999,9 @@ checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 
 [[package]]
 name = "universal-hash"
@@ -10602,36 +11062,31 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.2.1"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b"
+checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
 dependencies = [
  "form_urlencoded",
- "idna 0.2.2",
+ "idna 0.2.3",
  "matches",
  "percent-encoding 2.1.0",
 ]
 
 [[package]]
 name = "value-bag"
-version = "1.0.0-alpha.6"
+version = "1.0.0-alpha.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b676010e055c99033117c2343b33a40a30b91fecd6c49055ac9cd2d6c305ab1"
+checksum = "dd320e1520f94261153e96f7534476ad869c14022aee1e59af7c778075d840ae"
 dependencies = [
  "ctor",
+ "version_check",
 ]
 
 [[package]]
 name = "vcpkg"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
-
-[[package]]
-name = "vec-arena"
-version = "1.1.0"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34b2f665b594b07095e3ac3f718e13c2197143416fae4c5706cffb7b1af8d7f1"
+checksum = "cbdbff6266a24120518560b5dc983096efb98462e51d0d68169895b237be3e5d"
 
 [[package]]
 name = "vec_map"
@@ -10703,9 +11158,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.73"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9"
+checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd"
 dependencies = [
  "cfg-if 1.0.0",
  "wasm-bindgen-macro",
@@ -10713,9 +11168,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.73"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae"
+checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -10728,9 +11183,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.23"
+version = "0.4.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81b8b767af23de6ac18bf2168b690bed2902743ddf0fb39252e36f9e2bfc63ea"
+checksum = "5fba7978c679d53ce2d0ac80c8c175840feb849a161664365d1287b41f2e67f1"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -10740,9 +11195,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.73"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f"
+checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -10750,9 +11205,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.73"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c"
+checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10763,9 +11218,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.73"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489"
+checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f"
 
 [[package]]
 name = "wasm-gc-api"
@@ -10784,7 +11239,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "js-sys",
  "parking_lot 0.11.1",
  "pin-utils",
@@ -10801,7 +11256,7 @@ checksum = "bf617d864d25af3587aa745529f7aaa541066c876d57e050c0d0c85c61c92aff"
 dependencies = [
  "libc",
  "memory_units",
- "num-rational",
+ "num-rational 0.2.4",
  "num-traits",
  "parity-wasm 0.41.0",
  "wasmi-validation",
@@ -10818,15 +11273,15 @@ dependencies = [
 
 [[package]]
 name = "wasmparser"
-version = "0.71.0"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89a30c99437829ede826802bfcf28500cf58df00e66cb9114df98813bc145ff1"
+checksum = "755a9a4afe3f6cccbbe6d7e965eef44cf260b001f93e547eba84255c1d0187d8"
 
 [[package]]
 name = "wasmtime"
-version = "0.22.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7426055cb92bd9a1e9469b48154d8d6119cd8c498c8b70284e420342c05dc45d"
+checksum = "718cb52a9fdb7ab12471e9b9d051c9adfa6b5c504e0a1fea045e5eabc81eedd9"
 dependencies = [
  "anyhow",
  "backtrace",
@@ -10836,6 +11291,7 @@ dependencies = [
  "indexmap",
  "libc",
  "log",
+ "paste",
  "region",
  "rustc-demangle",
  "serde",
@@ -10844,6 +11300,7 @@ dependencies = [
  "wasmparser",
  "wasmtime-cache",
  "wasmtime-environ",
+ "wasmtime-fiber",
  "wasmtime-jit",
  "wasmtime-profiling",
  "wasmtime-runtime",
@@ -10853,9 +11310,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-cache"
-version = "0.22.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c01d9287e36921e46f5887a47007824ae5dbb9b7517a2d565660ab4471478709"
+checksum = "1f984df56c4adeba91540f9052db9f7a8b3b00cfaac1a023bee50a972f588b0c"
 dependencies = [
  "anyhow",
  "base64 0.13.0",
@@ -10866,7 +11323,7 @@ dependencies = [
  "libc",
  "log",
  "serde",
- "sha2 0.9.3",
+ "sha2 0.9.5",
  "toml",
  "winapi 0.3.9",
  "zstd",
@@ -10874,27 +11331,28 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-cranelift"
-version = "0.22.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4134ed3a4316cd0de0e546c6004850afe472b0fa3fcdc2f2c15f8d449562d962"
+checksum = "2a05abbf94e03c2c8ee02254b1949320c4d45093de5d9d6ed4d9351d536075c9"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
  "cranelift-frontend",
  "cranelift-wasm",
+ "wasmparser",
  "wasmtime-environ",
 ]
 
 [[package]]
 name = "wasmtime-debug"
-version = "0.22.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91fa931df6dd8af2b02606307674d3bad23f55473d5f4c809dddf7e4c4dc411"
+checksum = "382eecd6281c6c1d1f3c904c3c143e671fc1a9573820cbfa777fba45ce2eda9c"
 dependencies = [
  "anyhow",
- "gimli",
+ "gimli 0.23.0",
  "more-asserts",
- "object 0.22.0",
+ "object 0.23.0",
  "target-lexicon",
  "thiserror",
  "wasmparser",
@@ -10903,16 +11361,16 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-environ"
-version = "0.22.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1098871dc3120aaf8190d79153e470658bb79f63ee9ca31716711e123c28220"
+checksum = "81011b2b833663d7e0ce34639459a0e301e000fc7331e0298b3a27c78d0cec60"
 dependencies = [
  "anyhow",
  "cfg-if 1.0.0",
  "cranelift-codegen",
  "cranelift-entity",
  "cranelift-wasm",
- "gimli",
+ "gimli 0.23.0",
  "indexmap",
  "log",
  "more-asserts",
@@ -10921,13 +11379,24 @@ dependencies = [
  "wasmparser",
 ]
 
+[[package]]
+name = "wasmtime-fiber"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d92da32e31af2e3d828f485f5f24651ed4d3b7f03a46ea6555eae6940d1402cd"
+dependencies = [
+ "cc",
+ "libc",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "wasmtime-jit"
-version = "0.22.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "738bfcd1561ede8bb174215776fd7d9a95d5f0a47ca3deabe0282c55f9a89f68"
+checksum = "9b5f649623859a12d361fe4cc4793de44f7c3ff34c322c5714289787e89650bb"
 dependencies = [
- "addr2line",
+ "addr2line 0.14.1",
  "anyhow",
  "cfg-if 1.0.0",
  "cranelift-codegen",
@@ -10935,10 +11404,10 @@ dependencies = [
  "cranelift-frontend",
  "cranelift-native",
  "cranelift-wasm",
- "gimli",
+ "gimli 0.23.0",
  "log",
  "more-asserts",
- "object 0.22.0",
+ "object 0.23.0",
  "rayon",
  "region",
  "serde",
@@ -10956,13 +11425,13 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-obj"
-version = "0.22.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e96d77f1801131c5e86d93e42a3cf8a35402107332c202c245c83f34888a906"
+checksum = "ef2e99cd9858f57fd062e9351e07881cedfc8597928385e02a48d9333b9e15a1"
 dependencies = [
  "anyhow",
  "more-asserts",
- "object 0.22.0",
+ "object 0.23.0",
  "target-lexicon",
  "wasmtime-debug",
  "wasmtime-environ",
@@ -10970,16 +11439,16 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-profiling"
-version = "0.22.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60bb672c9d894776d7b9250dd9b4fe890f8760201ee4f53e5f2da772b6c4debb"
+checksum = "e46c0a590e49278ba7f79ef217af9db4ecc671b50042c185093e22d73524abb2"
 dependencies = [
  "anyhow",
  "cfg-if 1.0.0",
- "gimli",
+ "gimli 0.23.0",
  "lazy_static",
  "libc",
- "object 0.22.0",
+ "object 0.23.0",
  "scroll",
  "serde",
  "target-lexicon",
@@ -10989,9 +11458,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-runtime"
-version = "0.22.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a978086740949eeedfefcee667b57a9e98d9a7fc0de382fcfa0da30369e3530d"
+checksum = "1438a09185fc7ca067caf1a80d7e5b398eefd4fb7630d94841448ade60feb3d0"
 dependencies = [
  "backtrace",
  "cc",
@@ -11011,9 +11480,9 @@ dependencies = [
 
 [[package]]
 name = "wast"
-version = "35.0.1"
+version = "35.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a5800e9f86a1eae935e38bea11e60fd253f6d514d153fb39b3e5535a7b37b56"
+checksum = "2ef140f1b49946586078353a453a1d28ba90adfc54dde75710bc1931de204d68"
 dependencies = [
  "leb128",
 ]
@@ -11029,9 +11498,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.50"
+version = "0.3.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be"
+checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -11067,10 +11536,11 @@ dependencies = [
 
 [[package]]
 name = "westend-runtime"
-version = "0.8.29"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "bitvec 0.20.2",
+ "beefy-primitives",
+ "bitvec 0.20.4",
  "frame-executive",
  "frame-support",
  "frame-system",
@@ -11090,6 +11560,7 @@ dependencies = [
  "pallet-im-online",
  "pallet-indices",
  "pallet-membership",
+ "pallet-mmr-primitives",
  "pallet-multisig",
  "pallet-nicks",
  "pallet-offences",
@@ -11108,7 +11579,8 @@ dependencies = [
  "pallet-treasury",
  "pallet-utility",
  "pallet-vesting",
- "parity-scale-codec 2.0.1",
+ "pallet-xcm",
+ "parity-scale-codec 2.1.1",
  "polkadot-parachain",
  "polkadot-primitives",
  "polkadot-runtime-common",
@@ -11124,6 +11596,7 @@ dependencies = [
  "sp-core",
  "sp-inherents",
  "sp-io",
+ "sp-npos-elections",
  "sp-offchain",
  "sp-runtime",
  "sp-session",
@@ -11133,15 +11606,9 @@ dependencies = [
  "sp-version",
  "static_assertions",
  "substrate-wasm-builder 3.0.0",
-]
-
-[[package]]
-name = "which"
-version = "3.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724"
-dependencies = [
- "libc",
+ "xcm",
+ "xcm-builder",
+ "xcm-executor",
 ]
 
 [[package]]
@@ -11154,6 +11621,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "widestring"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c"
+
 [[package]]
 name = "winapi"
 version = "0.2.8"
@@ -11197,6 +11670,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "winreg"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
+dependencies = [
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "ws2_32-sys"
 version = "0.2.1"
@@ -11215,30 +11697,35 @@ checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
 
 [[package]]
 name = "x25519-dalek"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc614d95359fd7afc321b66d2107ede58b246b844cf5d8a0adcca413e439f088"
+checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f"
 dependencies = [
- "curve25519-dalek 3.0.2",
+ "curve25519-dalek 3.1.0",
  "rand_core 0.5.1",
  "zeroize",
 ]
 
 [[package]]
 name = "xcm"
-version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
- "parity-scale-codec 2.0.1",
+ "derivative",
+ "impl-trait-for-tuples",
+ "parity-scale-codec 2.1.1",
 ]
 
 [[package]]
 name = "xcm-builder"
-version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
  "frame-support",
- "parity-scale-codec 2.0.1",
+ "frame-system",
+ "impl-trait-for-tuples",
+ "pallet-transaction-payment",
+ "parity-scale-codec 2.1.1",
  "polkadot-parachain",
  "sp-arithmetic",
  "sp-io",
@@ -11250,13 +11737,13 @@ dependencies = [
 
 [[package]]
 name = "xcm-executor"
-version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#84d42e863eaf836ced9a28b43e6405c96585e21c"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.1#629b86977c88e8ad81e63aafb7f22062c90a6bf6"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
  "log",
- "parity-scale-codec 2.0.1",
+ "parity-scale-codec 2.1.1",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
@@ -11267,32 +11754,32 @@ dependencies = [
 
 [[package]]
 name = "yamux"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cc7bd8c983209ed5d527f44b01c41b7dc146fd960c61cf9e1d25399841dc271"
+checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107"
 dependencies = [
- "futures 0.3.13",
+ "futures 0.3.15",
  "log",
  "nohash-hasher",
  "parking_lot 0.11.1",
- "rand 0.7.3",
+ "rand 0.8.3",
  "static_assertions",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81a974bcdd357f0dca4d41677db03436324d45a4c9ed2d0b873a5a360ce41c36"
+checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd"
 dependencies = [
  "zeroize_derive",
 ]
 
 [[package]]
 name = "zeroize_derive"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16"
+checksum = "a2c1e130bebaeab2f23886bf9acbaca14b092408c452543c857f66399cd6dab1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -11302,18 +11789,18 @@ dependencies = [
 
 [[package]]
 name = "zstd"
-version = "0.5.4+zstd.1.4.7"
+version = "0.6.1+zstd.1.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69996ebdb1ba8b1517f61387a883857818a66c8a295f487b1ffd8fd9d2c82910"
+checksum = "5de55e77f798f205d8561b8fe2ef57abfb6e0ff2abe7fd3c089e119cdb5631a3"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "2.0.6+zstd.1.4.7"
+version = "3.0.1+zstd.1.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98aa931fb69ecee256d44589d19754e61851ae4769bf963b385119b1cc37a49e"
+checksum = "1387cabcd938127b30ce78c4bf00b30387dddf704e3f0881dbc4ff62b5566f8c"
 dependencies = [
  "libc",
  "zstd-sys",
@@ -11321,17 +11808,10 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "1.4.18+zstd.1.4.7"
+version = "1.4.20+zstd.1.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e6e8778706838f43f771d80d37787cb2fe06dafe89dd3aebaf6721b9eaec81"
+checksum = "ebd5b733d7cf2d9447e2c3e76a5589b4f5e5ae065c22a2bc0b023cbc331b6c8e"
 dependencies = [
  "cc",
- "glob",
- "itertools 0.9.0",
  "libc",
 ]
-
-[[patch.unused]]
-name = "pallet-claims"
-version = "3.0.1"
-source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=master#1ae45e9a1ca60e2d1bbc3f315403364728e71dd0"
diff --git a/Cargo.toml b/Cargo.toml
index 57534a6cb03..5156b8c725a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,103 +1,106 @@
 [patch.crates-io]
-frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-frame-benchmarking-cli = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-frame-executive = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-frame-support = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-frame-system = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-pallet-authorship = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-pallet-aura = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-pallet-collective = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-pallet-grandpa = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-pallet-randomness-collective-flip = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-pallet-session = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-pallet-society = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-pallet-sudo = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-pallet-timestamp = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-pallet-transaction-payment-rpc = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sc-basic-authorship = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sc-chain-spec = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sc-cli = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sc-client-api = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sc-client-db = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sc-consensus = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sc-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sc-consensus-epochs = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sc-executor = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sc-finality-grandpa = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sc-informant = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sc-keystore = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sc-network = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sc-offchain = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sc-rpc = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sc-rpc-api = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sc-service = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sc-telemetry = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sc-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sc-tracing = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-api = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-application-crypto = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-arithmetic = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-block-builder = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-blockchain = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-consensus = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-core = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-externalities = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-finality-grandpa = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-inherents = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-io = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-offchain = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-rpc = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-runtime-interface = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-session = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-std = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-staking = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-storage = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-state-machine = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-timestamp = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-tracing = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-trie = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-sp-version = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-substrate-frame-rpc-system = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
-
-pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate', branch = "rococo-v1" }
+frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+frame-benchmarking-cli = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+frame-executive = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+frame-support = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+frame-system = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+pallet-authorship = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+pallet-aura = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+pallet-collective = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+pallet-grandpa = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+pallet-randomness-collective-flip = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+pallet-session = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+pallet-society = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+pallet-sudo = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+pallet-timestamp = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+pallet-transaction-payment-rpc = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sc-basic-authorship = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sc-chain-spec = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sc-cli = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sc-client-api = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sc-client-db = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sc-consensus = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sc-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sc-consensus-epochs = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sc-executor = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sc-finality-grandpa = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sc-informant = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sc-keystore = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sc-network = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sc-offchain = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sc-rpc = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sc-rpc-api = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sc-service = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sc-telemetry = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sc-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sc-tracing = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-api = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-application-crypto = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-arithmetic = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-block-builder = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-blockchain = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-consensus = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-core = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-externalities = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-finality-grandpa = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-inherents = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-io = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-offchain = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-rpc = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-runtime-interface = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-session = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-std = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-staking = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-storage = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-state-machine = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-timestamp = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-tracing = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-trie = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+sp-version = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+substrate-frame-rpc-system = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+substrate-test-client = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+substrate-test-runtime-client = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
+pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.1" }
 
 # ORML dependencies
 orml-currencies = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master' }
 orml-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master' }
-orml-unknown-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master' }
+#orml-unknown-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master' }
 orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master' }
 orml-utilities = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master' }
-orml-xtokens= { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master' }
-orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master' }
+#orml-xtokens= { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master' }
+#orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master' }
 
 # Polkadot dependencies
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rococo-v1" }
-polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "rococo-v1" }
-polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "rococo-v1" }
-polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "rococo-v1" }
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "rococo-v1" }
-polkadot-runtime-common = { git = 'https://github.com/paritytech/polkadot', branch = "rococo-v1" }
-polkadot-test-runtime = { git = 'https://github.com/paritytech/polkadot', branch = "rococo-v1" }
-polkadot-test-client = { git = 'https://github.com/paritytech/polkadot', branch = "rococo-v1" }
-
-librocksdb-sys = { git = "https://github.com/hdevalence/rust-rocksdb", branch = "master" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.1" }
+polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.1" }
+polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.1" }
+polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.1" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.1" }
+polkadot-runtime-common = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.1" }
+polkadot-test-runtime = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.1" }
+polkadot-test-client = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.1" }
+#xcm = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.1" }
+#xcm-builder = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.1" }
+#xcm-executor = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.1" }
 
 primitives = { git = "https://github.com/galacticcouncil/HydraDX-node", branch = "master" }
-pallet-amm = { git = "https://github.com/galacticcouncil/HydraDX-node", branch = "master" }
+pallet-xyk = { git = "https://github.com/galacticcouncil/HydraDX-node", branch = "master" }
+pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil/HydraDX-node", branch = "master" }
+pallet-multi-payment-benchmarking = { git = "https://github.com/galacticcouncil/HydraDX-node", branch = "master" }
 pallet-exchange = { git = "https://github.com/galacticcouncil/HydraDX-node", branch = "master" }
 pallet-exchange-benchmarking = { git = "https://github.com/galacticcouncil/HydraDX-node", branch = "master" }
 pallet-faucet = { git = "https://github.com/galacticcouncil/HydraDX-node", branch = "master" }
-pallet-claims = { git = "https://github.com/galacticcouncil/HydraDX-node", branch = "master" }
 pallet-asset-registry = { git = "https://github.com/galacticcouncil/HydraDX-node", branch = "master" }
-module-amm-rpc-runtime-api = { git = "https://github.com/galacticcouncil/HydraDX-node", branch = "master" }
-module-amm-rpc = { git = "https://github.com/galacticcouncil/HydraDX-node", branch = "master" }
+pallet-xyk-rpc-runtime-api = { git = "https://github.com/galacticcouncil/HydraDX-node", branch = "master" }
+pallet-xyk-rpc = { git = "https://github.com/galacticcouncil/HydraDX-node", branch = "master" }
 
 [profile.release]
 panic = 'unwind'
diff --git a/node/Cargo.toml b/node/Cargo.toml
index 70f846548a1..8115954b625 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -29,7 +29,7 @@ structopt = '0.3.8'
 
 # local dependencies
 basilisk-runtime = {path = '../runtime', version = '3.0.0'}
-module-amm-rpc = {version = '3.0.0'}
+pallet-xyk-rpc = {version = '1.0.0'}
 primitives = {version = '3.0.0'}
 
 # Substrate dependencies
@@ -64,21 +64,29 @@ sp-timestamp = '3.0.0'
 sp-transaction-pool = '3.0.0'
 sp-trie = '3.0.0'
 substrate-frame-rpc-system = '3.0.0'
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" }
+sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" }
 
 # Cumulus dependencies
-cumulus-client-cli = {git = "https://github.com/paritytech/cumulus", branch = "rococo-v1"}
-cumulus-client-collator = {git = "https://github.com/paritytech/cumulus", branch = "rococo-v1"}
-cumulus-client-consensus-relay-chain = {git = "https://github.com/paritytech/cumulus", branch = "rococo-v1"}
-cumulus-client-network = {git = "https://github.com/paritytech/cumulus", branch = "rococo-v1"}
-cumulus-client-service = {git = "https://github.com/paritytech/cumulus", branch = "rococo-v1"}
-cumulus-primitives-core = {git = "https://github.com/paritytech/cumulus", branch = "rococo-v1"}
+cumulus-client-cli = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1"}
+cumulus-client-collator = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1"}
+cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1" }
+cumulus-client-consensus-relay-chain = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1"}
+cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1" }
+cumulus-client-network = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1"}
+cumulus-client-service = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1"}
+cumulus-primitives-core = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1"}
+cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1" }
 
 # Polkadot dependencies
-polkadot-cli = {git = "https://github.com/paritytech/polkadot", branch = "rococo-v1"}
-polkadot-parachain = {git = "https://github.com/paritytech/polkadot", branch = "rococo-v1"}
-polkadot-primitives = {git = "https://github.com/paritytech/polkadot", branch = "rococo-v1"}
-polkadot-service = {git = "https://github.com/paritytech/polkadot", branch = "rococo-v1"}
-polkadot-test-service = {git = "https://github.com/paritytech/polkadot", branch = "rococo-v1"}
+polkadot-cli = {version="0.9.1"}
+polkadot-parachain = {version="0.9.1"}
+polkadot-primitives = {version="0.9.1"}
+polkadot-service = {version="0.9.1"}
+polkadot-test-service = {version="0.9.1"}
 
 [features]
 default = [
@@ -91,12 +99,11 @@ runtime-benchmarks = [
 
 [dev-dependencies]
 # Polkadot dependencies
-polkadot-runtime-common = {git = 'https://github.com/paritytech/polkadot', branch = "rococo-v1"}
-polkadot-test-client = {git = 'https://github.com/paritytech/polkadot', branch = "rococo-v1"}
-polkadot-test-runtime = {git = 'https://github.com/paritytech/polkadot', branch = "rococo-v1"}
-polkadot-test-service = {git = 'https://github.com/paritytech/polkadot', branch = "rococo-v1"}
+polkadot-runtime-common = {version="0.9.1"}
+polkadot-test-client = {version="0.9.1"}
+polkadot-test-runtime = {version="0.9.1"}
 
 # Substrate dependencies
-pallet-sudo = {git = 'https://github.com/paritytech/substrate', branch = "rococo-v1"}
-substrate-test-client = {git = 'https://github.com/paritytech/substrate', branch = "rococo-v1"}
-substrate-test-runtime-client = {git = 'https://github.com/paritytech/substrate', branch = "rococo-v1"}
+pallet-sudo = {version="3.0.0"}
+substrate-test-client = {version="2.0.1"}
+substrate-test-runtime-client = {version="2.0.0"}
diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs
index d22c3c33a3d..0d70e60dd9c 100644
--- a/node/src/chain_spec.rs
+++ b/node/src/chain_spec.rs
@@ -2,7 +2,7 @@
 
 use cumulus_primitives_core::ParaId;
 use basilisk_runtime::{
-	AccountId, AssetRegistryConfig, BalancesConfig, FaucetConfig, GenesisConfig, ParachainInfoConfig, Signature,
+	AccountId, AuraId, AuraConfig, AssetRegistryConfig, BalancesConfig, FaucetConfig, GenesisConfig, ParachainInfoConfig, Signature,
 	SudoConfig, SystemConfig, TokensConfig, CORE_ASSET_ID, WASM_BINARY,
 };
 use hex_literal::hex;
@@ -68,6 +68,11 @@ pub fn roccocco_parachain_config(para_id: ParaId) -> Result<ChainSpec, String> {
 				wasm_binary,
 				// Sudo account
 				hex!["30035c21ba9eda780130f2029a80c3e962f56588bc04c36be95a225cb536fb55"].into(),
+				// TODO generate real authorities
+				vec![
+					get_from_seed::<AuraId>("Alice"),
+					get_from_seed::<AuraId>("Bob"),
+				],
 				// Pre-funded accounts
 				vec![hex!["30035c21ba9eda780130f2029a80c3e962f56588bc04c36be95a225cb536fb55"].into()],
 				true,
@@ -84,7 +89,7 @@ pub fn roccocco_parachain_config(para_id: ParaId) -> Result<ChainSpec, String> {
 		Some(properties),
 		// Extensions
 		Extensions {
-			relay_chain: "rococo".into(),
+			relay_chain: "westend-dev".into(),
 			para_id: para_id.into(),
 		},
 	))
@@ -106,6 +111,10 @@ pub fn parachain_development_config(para_id: ParaId) -> Result<ChainSpec, String
 				wasm_binary,
 				// Sudo account
 				get_account_id_from_seed::<sr25519::Public>("Alice"),
+				vec![
+					get_from_seed::<AuraId>("Alice"),
+					get_from_seed::<AuraId>("Bob"),
+				],
 				// Pre-funded accounts
 				vec![
 					get_account_id_from_seed::<sr25519::Public>("Alice"),
@@ -127,7 +136,7 @@ pub fn parachain_development_config(para_id: ParaId) -> Result<ChainSpec, String
 		Some(properties),
 		// Extensions
 		Extensions {
-			relay_chain: "local_testnet".into(),
+			relay_chain: "westend-dev".into(),
 			para_id: para_id.into(),
 		},
 	))
@@ -150,6 +159,10 @@ pub fn local_parachain_config(para_id: ParaId) -> Result<ChainSpec, String> {
 				wasm_binary,
 				// Sudo account
 				get_account_id_from_seed::<sr25519::Public>("Alice"),
+				vec![
+					get_from_seed::<AuraId>("Alice"),
+					get_from_seed::<AuraId>("Bob"),
+				],
 				// Pre-funded accounts
 				vec![
 					get_account_id_from_seed::<sr25519::Public>("Alice"),
@@ -179,7 +192,7 @@ pub fn local_parachain_config(para_id: ParaId) -> Result<ChainSpec, String> {
 		Some(properties),
 		// Extensions
 		Extensions {
-			relay_chain: "local_testnet".into(),
+			relay_chain: "westend-dev".into(),
 			para_id: para_id.into(),
 		},
 	))
@@ -189,6 +202,7 @@ pub fn local_parachain_config(para_id: ParaId) -> Result<ChainSpec, String> {
 fn parachain_genesis(
 	wasm_binary: &[u8],
 	root_key: AccountId,
+	initial_authorities: Vec<AuraId>,
 	endowed_accounts: Vec<AccountId>,
 	_enable_println: bool,
 	parachain_id: ParaId,
@@ -211,6 +225,9 @@ fn parachain_genesis(
 			// Assign network admin rights.
 			key: root_key,
 		},
+		pallet_aura: AuraConfig {
+			authorities: initial_authorities,
+		},
 		pallet_asset_registry: AssetRegistryConfig {
 			core_asset_id: CORE_ASSET_ID,
 			asset_ids: vec![
@@ -240,5 +257,6 @@ fn parachain_genesis(
 			mint_limit: 5,
 			mintable_currencies: vec![0, 1, 2],
 		},
+		cumulus_pallet_aura_ext: Default::default(),
 	}
 }
diff --git a/node/src/cli.rs b/node/src/cli.rs
index ee049a7c74d..ec628aef2c7 100644
--- a/node/src/cli.rs
+++ b/node/src/cli.rs
@@ -1,4 +1,5 @@
 use crate::chain_spec;
+use sc_cli;
 use std::path::PathBuf;
 use structopt::StructOpt;
 
@@ -13,13 +14,7 @@ pub struct Cli {
 	pub subcommand: Option<Subcommand>,
 
 	#[structopt(flatten)]
-	pub run: RunCmd,
-
-	/// Run node as collator.
-	///
-	/// Note that this is the same as running with `--validator`.
-	#[structopt(long, conflicts_with = "validator")]
-	pub collator: bool,
+	pub run: cumulus_client_cli::RunCmd,
 
 	/// Relaychain arguments
 	#[structopt(raw = true)]
@@ -102,6 +97,10 @@ pub struct ExportGenesisStateCommand {
 	#[structopt(long, default_value = "200")]
 	pub parachain_id: u32,
 
+	/// Write output in binary. Default is to write in hex.
+	#[structopt(short, long)]
+	pub raw: bool,
+
 	/// The name of the chain for that the genesis state should be exported.
 	#[structopt(long)]
 	pub chain: Option<String>,
@@ -122,21 +121,3 @@ pub struct ExportGenesisWasmCommand {
 	#[structopt(long)]
 	pub chain: Option<String>,
 }
-
-#[derive(Debug, StructOpt)]
-pub struct RunCmd {
-	#[structopt(flatten)]
-	pub base: sc_cli::RunCmd,
-
-	/// Id of the parachain this collator collates for.
-	#[structopt(long)]
-	pub parachain_id: Option<u32>,
-}
-
-impl std::ops::Deref for RunCmd {
-	type Target = sc_cli::RunCmd;
-
-	fn deref(&self) -> &Self::Target {
-		&self.base
-	}
-}
diff --git a/node/src/command.rs b/node/src/command.rs
index 5ac667e8521..1e18c603b68 100644
--- a/node/src/command.rs
+++ b/node/src/command.rs
@@ -62,11 +62,11 @@ impl SubstrateCli for Cli {
 	}
 
 	fn support_url() -> String {
-		"support.anonymous.an".into()
+		"https://github.com/galacticcouncil/Basilisk-node/issues".into()
 	}
 
 	fn copyright_start_year() -> i32 {
-		2017
+		2020
 	}
 
 	fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
@@ -86,7 +86,7 @@ impl SubstrateCli for Cli {
 
 impl SubstrateCli for RelayChainCli {
 	fn impl_name() -> String {
-		"basilisk rococo relay node".into()
+		"basilisk collator".into()
 	}
 
 	fn impl_version() -> String {
@@ -102,15 +102,16 @@ impl SubstrateCli for RelayChainCli {
 	}
 
 	fn support_url() -> String {
-		"support.anonymous.an".into()
+		"https://github.com/galacticcouncil/Basilisk-node/issues".into()
 	}
 
 	fn copyright_start_year() -> i32 {
-		2017
+		2020
 	}
 
 	fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
-		polkadot_cli::Cli::from_iter([RelayChainCli::executable_name()].iter()).load_spec(id)
+		polkadot_cli::Cli::from_iter([RelayChainCli::executable_name().to_string()].iter())
+			.load_spec(id)
 	}
 
 	fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {
@@ -228,12 +229,17 @@ pub fn run() -> sc_cli::Result<()> {
 				&params.chain.clone().unwrap_or_default(),
 				params.parachain_id.into(),
 			)?)?;
-			let header_hex = format!("0x{:?}", HexDisplay::from(&block.header().encode()));
+			let raw_header = block.header().encode();
+			let output_buf = if params.raw {
+				raw_header
+			} else {
+				format!("0x{:?}", HexDisplay::from(&block.header().encode())).into_bytes()
+			};
 
 			if let Some(output) = &params.output {
-				std::fs::write(output, header_hex)?;
+				std::fs::write(output, output_buf)?;
 			} else {
-				print!("{}", header_hex);
+				std::io::stdout().write_all(&output_buf)?;
 			}
 
 			Ok(())
@@ -259,7 +265,7 @@ pub fn run() -> sc_cli::Result<()> {
 			Ok(())
 		}
 		None => {
-			let runner = cli.create_runner(&*cli.run)?;
+			let runner = cli.create_runner(&cli.run.normalize())?;
 
 			runner.run_node_until_exit(|config| async move {
 				// TODO
@@ -269,7 +275,7 @@ pub fn run() -> sc_cli::Result<()> {
 
 				let polkadot_cli = RelayChainCli::new(
 					&config,
-					[RelayChainCli::executable_name()]
+					[RelayChainCli::executable_name().to_string()]
 						.iter()
 						.chain(cli.relaychain_args.iter()),
 				);
@@ -284,14 +290,20 @@ pub fn run() -> sc_cli::Result<()> {
 				let task_executor = config.task_executor.clone();
 				let polkadot_config = SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, task_executor)
 					.map_err(|err| format!("Relay chain argument error: {}", err))?;
-				let collator = cli.run.base.validator || cli.collator;
 
 				info!("Parachain id: {:?}", id);
 				info!("Parachain Account: {}", parachain_account);
 				info!("Parachain genesis state: {}", genesis_state);
-				info!("Is collating: {}", if collator { "yes" } else { "no" });
+				info!(
+					"Is collating: {}",
+					if config.role.is_authority() {
+						"yes"
+					} else {
+						"no"
+					}
+				);
 
-				crate::service::start_node(config, key, polkadot_config, id, collator)
+				crate::service::start_node(config, key, polkadot_config, id)
 					.await
 					.map(|r| r.0)
 					.map_err(Into::into)
diff --git a/node/src/rpc.rs b/node/src/rpc.rs
index 996ddcd012c..37dacb69047 100644
--- a/node/src/rpc.rs
+++ b/node/src/rpc.rs
@@ -32,11 +32,11 @@ where
 	C: Send + Sync + 'static,
 	C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,
 	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,
-	C::Api: module_amm_rpc::AMMRuntimeApi<Block, AccountId, AssetId, Balance>,
+	C::Api: pallet_xyk_rpc::XYKRuntimeApi<Block, AccountId, AssetId, Balance>,
 	C::Api: BlockBuilder<Block>,
 	P: TransactionPool + 'static,
 {
-	use module_amm_rpc::{AMMApi, AMM};
+	use pallet_xyk_rpc::{XYKApi, XYK};
 	use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi};
 	use substrate_frame_rpc_system::{FullSystem, SystemApi};
 
@@ -62,7 +62,7 @@ where
 	// to call into the runtime.
 	// `io.extend_with(YourRpcTrait::to_delegate(YourRpcStruct::new(ReferenceToClient, ...)));`
 
-	io.extend_with(AMMApi::to_delegate(AMM::new(client)));
+	io.extend_with(XYKApi::to_delegate(XYK::new(client)));
 
 	io
 }
diff --git a/node/src/service.rs b/node/src/service.rs
index 75ac13f725e..8fca887c95e 100644
--- a/node/src/service.rs
+++ b/node/src/service.rs
@@ -2,21 +2,27 @@
 
 #![allow(clippy::all)]
 
-use cumulus_client_consensus_relay_chain::{build_relay_chain_consensus, import_queue, BuildRelayChainConsensusParams};
+use cumulus_client_consensus_aura::{
+	build_aura_consensus, BuildAuraConsensusParams, SlotProportion, AuraBlockImport
+};
+use cumulus_client_consensus_common::ParachainConsensus;
 use cumulus_client_network::build_block_announce_validator;
 use cumulus_client_service::{
 	prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams,
 };
 use cumulus_primitives_core::ParaId;
-use basilisk_runtime::{self, opaque::Block, RuntimeApi};
-use polkadot_primitives::v0::CollatorPair;
+use basilisk_runtime::{self, RuntimeApi};
+use polkadot_primitives::v1::CollatorPair;
 use sc_executor::native_executor_instance;
+use sc_client_api::ExecutorProvider;
+use sc_network::NetworkService;
 pub use sc_executor::NativeExecutor;
-use sc_service::{error::Error as ServiceError, Configuration, PartialComponents, Role, TaskManager};
-use sc_telemetry::{Telemetry, TelemetryWorker, TelemetryWorkerHandle};
-use sp_runtime::traits::BlakeTwo256;
-use sp_trie::PrefixedMemoryDB;
+use sc_service::{Configuration, PartialComponents, Role, TaskManager, TFullBackend, TFullClient};
+use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
+use sp_consensus::SlotData;
+use sp_keystore::SyncCryptoStorePtr;
 use std::sync::Arc;
+use substrate_prometheus_endpoint::Registry;
 
 // Our native executor instance.
 native_executor_instance!(
@@ -26,24 +32,25 @@ native_executor_instance!(
 	frame_benchmarking::benchmarking::HostFunctions,
 );
 
-type FullClient = sc_service::TFullClient<Block, RuntimeApi, Executor>;
-type FullBackend = sc_service::TFullBackend<Block>;
+type BlockNumber = u32;
+type Header = sp_runtime::generic::Header<BlockNumber, sp_runtime::traits::BlakeTwo256>;
+pub type Block = sp_runtime::generic::Block<Header, sp_runtime::OpaqueExtrinsic>;
+type Hash = sp_core::H256;
 
 pub fn new_partial(
-	config: &Configuration,
+	config: &Configuration
 ) -> Result<
-	sc_service::PartialComponents<
-		FullClient,
-		FullBackend,
+	PartialComponents<
+		TFullClient<Block, RuntimeApi, Executor>,
+		TFullBackend<Block>,
 		(),
-		sp_consensus::import_queue::BasicQueue<Block, PrefixedMemoryDB<BlakeTwo256>>,
-		sc_transaction_pool::FullPool<Block, FullClient>,
+		sp_consensus::DefaultImportQueue<Block, TFullClient<Block, RuntimeApi, Executor>>,
+		sc_transaction_pool::FullPool<Block, TFullClient<Block, RuntimeApi, Executor>>,
 		(Option<Telemetry>, Option<TelemetryWorkerHandle>),
 	>,
-	ServiceError,
-> {
-	let inherent_data_providers = sp_inherents::InherentDataProviders::new();
-
+	sc_service::Error,
+>
+{
 	let telemetry = config
 		.telemetry_endpoints
 		.clone()
@@ -76,12 +83,11 @@ pub fn new_partial(
 		client.clone(),
 	);
 
-	let import_queue = import_queue(
-		client.clone(),
+	let import_queue = parachain_build_import_queue(
 		client.clone(),
-		inherent_data_providers.clone(),
-		&task_manager.spawn_essential_handle(),
-		config.prometheus_registry(),
+		config,
+		telemetry.as_ref().map(|telemetry| telemetry.handle()),
+		&task_manager,
 	)?;
 
 	Ok(PartialComponents {
@@ -91,7 +97,6 @@ pub fn new_partial(
 		keystore_container,
 		task_manager,
 		transaction_pool,
-		inherent_data_providers,
 		select_chain: (),
 		other: (telemetry, telemetry_worker_handle),
 	})
@@ -100,16 +105,25 @@ pub fn new_partial(
 /// Start a node with the given parachain `Configuration` and relay chain `Configuration`.
 ///
 /// This is the actual implementation that is abstract over the executor and the runtime api.
-async fn start_node_impl<RB>(
+async fn start_node_impl<BIC>(
 	parachain_config: Configuration,
 	collator_key: CollatorPair,
 	polkadot_config: Configuration,
 	para_id: ParaId,
-	validator: bool,
-	_rpc_ext_builder: RB,
-) -> sc_service::error::Result<(TaskManager, Arc<FullClient>)>
+	build_consensus: BIC,
+) -> sc_service::error::Result<(TaskManager, Arc<TFullClient<Block, RuntimeApi, Executor>>)>
 where
-	RB: Fn(Arc<FullClient>) -> jsonrpc_core::IoHandler<sc_rpc::Metadata> + Send + 'static,
+	BIC: FnOnce(
+		Arc<TFullClient<Block, RuntimeApi, Executor>>,
+		Option<&Registry>,
+		Option<TelemetryHandle>,
+		&TaskManager,
+		&polkadot_service::NewFull<polkadot_service::Client>,
+		Arc<sc_transaction_pool::FullPool<Block, TFullClient<Block, RuntimeApi, Executor>>>,
+		Arc<NetworkService<Block, Hash>>,
+		SyncCryptoStorePtr,
+		bool,
+	) -> Result<Box<dyn ParachainConsensus<Block>>, sc_service::Error>,
 {
 	if matches!(parachain_config.role, Role::Light) {
 		return Err("Light client not supported!".into());
@@ -118,11 +132,6 @@ where
 	let parachain_config = prepare_node_config(parachain_config);
 
 	let params = new_partial(&parachain_config)?;
-	params
-		.inherent_data_providers
-		.register_provider(sp_timestamp::InherentDataProvider)
-		.unwrap();
-
 	let (mut telemetry, telemetry_worker_handle) = params.other;
 
 	let polkadot_full_node = cumulus_client_service::build_polkadot_full_node(
@@ -144,6 +153,8 @@ where
 		polkadot_full_node.backend.clone(),
 	);
 
+	let force_authoring = parachain_config.force_authoring;
+	let validator = parachain_config.role.is_authority();
 	let prometheus_registry = parachain_config.prometheus_registry().cloned();
 	let transaction_pool = params.transaction_pool.clone();
 	let mut task_manager = params.task_manager;
@@ -196,23 +207,19 @@ where
 	};
 
 	if validator {
-		let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(
-			task_manager.spawn_handle(),
+		let parachain_consensus = build_consensus(
 			client.clone(),
-			transaction_pool,
 			prometheus_registry.as_ref(),
-			telemetry.as_ref().map(|x| x.handle()),
-		);
-		let spawner = task_manager.spawn_handle();
+			telemetry.as_ref().map(|t| t.handle()),
+			&task_manager,
+			&polkadot_full_node,
+			transaction_pool,
+			network,
+			params.keystore_container.sync_keystore(),
+			force_authoring,
+		)?;
 
-		let parachain_consensus = build_relay_chain_consensus(BuildRelayChainConsensusParams {
-			para_id,
-			proposer_factory,
-			inherent_data_providers: params.inherent_data_providers,
-			block_import: client.clone(),
-			relay_chain_client: polkadot_full_node.client.clone(),
-			relay_chain_backend: polkadot_full_node.backend.clone(),
-		});
+		let spawner = task_manager.spawn_handle();
 
 		let params = StartCollatorParams {
 			para_id,
@@ -223,7 +230,6 @@ where
 			collator_key,
 			relay_chain_full_node: polkadot_full_node,
 			spawner,
-			backend,
 			parachain_consensus,
 		};
 
@@ -245,6 +251,58 @@ where
 	Ok((task_manager, client))
 }
 
+/// Build the import queue for the parachain runtime.
+pub fn parachain_build_import_queue(
+	client: Arc<TFullClient<Block, RuntimeApi, Executor>>,
+	config: &Configuration,
+	telemetry: Option<TelemetryHandle>,
+	task_manager: &TaskManager,
+) -> Result<
+	sp_consensus::DefaultImportQueue<
+		Block,
+		TFullClient<Block, RuntimeApi, Executor>,
+	>,
+	sc_service::Error,
+> {
+	let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;
+
+	let block_import = AuraBlockImport::<
+		_,
+		_,
+		_,
+		sp_consensus_aura::sr25519::AuthorityPair,
+	>::new(client.clone(), client.clone());
+
+	cumulus_client_consensus_aura::import_queue::<
+		sp_consensus_aura::sr25519::AuthorityPair,
+		_,
+		_,
+		_,
+		_,
+		_,
+		_,
+	>(cumulus_client_consensus_aura::ImportQueueParams {
+		block_import,
+		client: client.clone(),
+		create_inherent_data_providers: move |_, _| async move {
+			let time = sp_timestamp::InherentDataProvider::from_system_time();
+
+			let slot =
+				sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
+					*time,
+					slot_duration.slot_duration(),
+				);
+
+			Ok((time, slot))
+		},
+		registry: config.prometheus_registry().clone(),
+		can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
+		spawner: &task_manager.spawn_essential_handle(),
+		telemetry,
+	})
+		.map_err(Into::into)
+}
+
 /// Start a normal parachain node.
 #[sc_tracing::logging::prefix_logs_with("Parachain")]
 pub async fn start_node(
@@ -252,15 +310,88 @@ pub async fn start_node(
 	collator_key: CollatorPair,
 	polkadot_config: Configuration,
 	para_id: ParaId,
-	validator: bool,
-) -> sc_service::error::Result<(TaskManager, Arc<FullClient>)> {
-	start_node_impl(
+) -> sc_service::error::Result<
+	(TaskManager, Arc<TFullClient<Block, RuntimeApi, Executor>>)
+> {
+	start_node_impl::<_>(
 		parachain_config,
 		collator_key,
 		polkadot_config,
 		para_id,
-		validator,
-		|_| Default::default(),
+		|client,
+		 prometheus_registry,
+		 telemetry,
+		 task_manager,
+		 relay_chain_node,
+		 transaction_pool,
+		 sync_oracle,
+		 keystore,
+		 force_authoring| {
+			let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;
+
+			let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(
+				task_manager.spawn_handle(),
+				client.clone(),
+				transaction_pool,
+				prometheus_registry.clone(),
+				telemetry.clone(),
+			);
+
+			let relay_chain_backend = relay_chain_node.backend.clone();
+			let relay_chain_client = relay_chain_node.client.clone();
+			Ok(build_aura_consensus::<
+				sp_consensus_aura::sr25519::AuthorityPair,
+				_,
+				_,
+				_,
+				_,
+				_,
+				_,
+				_,
+				_,
+				_,
+			>(BuildAuraConsensusParams {
+				proposer_factory,
+				create_inherent_data_providers: move |_, (relay_parent, validation_data)| {
+					let parachain_inherent =
+						cumulus_primitives_parachain_inherent::ParachainInherentData::create_at_with_client(
+							relay_parent,
+							&relay_chain_client,
+							&*relay_chain_backend,
+							&validation_data,
+							para_id,
+						);
+					async move {
+						let time = sp_timestamp::InherentDataProvider::from_system_time();
+
+						let slot =
+							sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
+								*time,
+								slot_duration.slot_duration(),
+							);
+
+						let parachain_inherent = parachain_inherent.ok_or_else(|| {
+							Box::<dyn std::error::Error + Send + Sync>::from(
+								"Failed to create parachain inherent",
+							)
+						})?;
+						Ok((time, slot, parachain_inherent))
+					}
+				},
+				block_import: client.clone(),
+				relay_chain_client: relay_chain_node.client.clone(),
+				relay_chain_backend: relay_chain_node.backend.clone(),
+				para_client: client.clone(),
+				backoff_authoring_blocks: Option::<()>::None,
+				sync_oracle,
+				keystore,
+				force_authoring,
+				slot_duration,
+				// We got around 500ms for proposing
+				block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32),
+				telemetry,
+			}))
+		},
 	)
-	.await
+		.await
 }
diff --git a/pallets/transaction-multi-payment/Cargo.toml b/pallets/transaction-multi-payment/Cargo.toml
deleted file mode 100644
index df4f456c620..00000000000
--- a/pallets/transaction-multi-payment/Cargo.toml
+++ /dev/null
@@ -1,69 +0,0 @@
-[package]
-name = 'pallet-transaction-multi-payment'
-authors = ['GalacticCoucil']
-description = 'Transaction multi currency payment support module'
-edition = '2018'
-homepage = 'https://github.com/galacticcouncil/hydra-dx'
-license = 'Unlicense'
-repository = 'https://github.com/galacticcouncil/hydra-dx'
-version = '3.0.0'
-
-[package.metadata.docs.rs]
-targets = ['x86_64-unknown-linux-gnu']
-
-[build-dependencies]
-wasm-builder-runner = {package = 'substrate-wasm-builder-runner', version = '1.0.5'}
-
-# alias "parity-scale-code" to "codec"
-[dependencies.codec]
-default-features = false
-features = ['derive']
-package = 'parity-scale-codec'
-version = '2.0.0'
-
-[dependencies]
-primitive-types = {default-features = false, version = '0.8.0'}
-serde = {features = ['derive'], optional = true, version = '1.0.101'}
-
-# Local dependecies
-primitives = {default-features = false, version = "3.0.0"}
-
-# ORML dependencies
-orml-tokens = {default-features = false, version = "0.4.1-dev"}
-orml-traits = {default-features = false, version = "0.4.1-dev"}
-orml-utilities = {default-features = false, version = "0.4.1-dev"}
-
-# Substrate dependencies
-frame-support = {default-features = false, version = '3.0.0'}
-frame-system = {default-features = false, version = '3.0.0'}
-sp-std = {default-features = false, version = '3.0.0'}
-sp-core = {default-features = false, version = '3.0.0'}
-sp-runtime = {default-features = false, version = '3.0.0'}
-sp-api= {default-features = false, version = '3.0.0'}
-
-pallet-transaction-payment = {default-features = false, version = '3.0.0'}
-
-[dev-dependencies]
-sp-io = {default-features = false, version = '3.0.0'}
-orml-currencies = {default-features = false, version = "0.4.1-dev"}
-pallet-asset-registry= { default-features = false, version = "3.0.0" }
-pallet-amm = { default-features = false, version = "4.0.1" }
-pallet-balances = {default-features = false, version = '3.0.0' }
-
-[features]
-default = ['std']
-std = [
-    'serde/std',
-    'codec/std',
-    'sp-core/std',
-    'sp-api/std',
-    'frame-support/std',
-    'frame-system/std',
-    'sp-runtime/std',
-    'orml-tokens/std',
-    'orml-traits/std',
-    'pallet-balances/std',
-    'pallet-asset-registry/std',
-    'pallet-amm/std',
-]
-
diff --git a/pallets/transaction-multi-payment/README.md b/pallets/transaction-multi-payment/README.md
deleted file mode 100644
index 52c9c0b4743..00000000000
--- a/pallets/transaction-multi-payment/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Transaction payment in external currencies
-
-User is able to select a currency he wants to pay the transaction with (if such token is supported and the pool of HDX with the token exists
diff --git a/pallets/transaction-multi-payment/benchmarking/Cargo.toml b/pallets/transaction-multi-payment/benchmarking/Cargo.toml
deleted file mode 100644
index db7ab201770..00000000000
--- a/pallets/transaction-multi-payment/benchmarking/Cargo.toml
+++ /dev/null
@@ -1,68 +0,0 @@
-[package]
-authors = ['GalacticCouncil']
-description = 'HydraDX Transaction Payment Benchmarking Pallet'
-edition = '2018'
-homepage = 'https://github.com/galacticcouncil/hydra-dx'
-license = 'Unlicense'
-name = 'pallet-multi-payment-benchmarking'
-repository = 'https://github.com/galacticcouncil/hydra-dx'
-version = '3.0.0'
-
-[package.metadata.docs.rs]
-targets = ['x86_64-unknown-linux-gnu']
-
-[build-dependencies]
-wasm-builder-runner = { package = 'substrate-wasm-builder-runner', version = '1.0.5' }
-
-# alias "parity-scale-code" to "codec"
-[dependencies.codec]
-default-features = false
-features = ['derive']
-package = 'parity-scale-codec'
-version = '2.0.0'
-
-[dependencies]
-serde = { features = ['derive'], optional = true, version = '1.0.101' }
-
-# Local dependencies
-primitives = { default-features = false , version = "3.0.0"}
-pallet-asset-registry= { default-features = false, version = "3.0.0" }
-pallet-amm = { default-features = false, version = "4.0.1" }
-pallet-transaction-multi-payment = { path = '../../transaction-multi-payment', default-features = false }
-
-# ORML dependencies
-orml-traits = { default-features = false, version = "0.4.1-dev" }
-orml-tokens = { default-features = false, version = "0.4.1-dev" }
-orml-currencies= { default-features = false, version = "0.4.1-dev" }
-orml-utilities = {default-features = false, version = "0.4.1-dev"}
-
-# Substrate dependencies
-frame-system = { default-features = false, version = '3.0.0' }
-frame-support = { default-features = false, version = '3.0.0' }
-frame-benchmarking = { default-features = false, version = '3.0.0' }
-frame-system-benchmarking = { default-features = false, version = '3.0.0' }
-pallet-transaction-payment = {default-features = false, version = '3.0.0'}
-sp-std = { default-features = false, version = '3.0.0' }
-pallet-balances = {default-features = false, version = '3.0.0' }
-
-sp-core = { default-features = false, version = '3.0.0' }
-sp-runtime = { default-features = false, version = '3.0.0' }
-
-[dev-dependencies]
-sp-io = { default-features = false, version = '3.0.0' }
-
-[features]
-default = ['std']
-std = [
-  'serde',
-  'codec/std',
-  'frame-support/std',
-  'frame-system/std',
-  'sp-std/std',
-  'sp-runtime/std',
-  'primitives/std',
-  'pallet-amm/std',
-  'pallet-asset-registry/std',
-  'pallet-transaction-multi-payment/std',
-  "frame-benchmarking/std",
-]
diff --git a/pallets/transaction-multi-payment/benchmarking/src/lib.rs b/pallets/transaction-multi-payment/benchmarking/src/lib.rs
deleted file mode 100644
index 7a999c91417..00000000000
--- a/pallets/transaction-multi-payment/benchmarking/src/lib.rs
+++ /dev/null
@@ -1,133 +0,0 @@
-#![cfg_attr(not(feature = "std"), no_std)]
-
-mod mock;
-
-use sp_std::prelude::*;
-
-use frame_benchmarking::{account, benchmarks};
-use frame_system::RawOrigin;
-use orml_traits::{MultiCurrency, MultiCurrencyExtended};
-use orml_utilities::OrderedSet;
-use pallet_transaction_multi_payment::Pallet as MultiPaymentModule;
-use primitives::{Amount, AssetId, Balance, Price};
-
-use frame_support::dispatch;
-use pallet_amm as ammpool;
-
-pub struct Pallet<T: Config>(pallet_transaction_multi_payment::Pallet<T>);
-
-pub trait Config:
-	pallet_transaction_payment::Config + pallet_transaction_multi_payment::Config + ammpool::Config
-{
-}
-
-const SEED: u32 = 0;
-const ASSET_ID: u32 = 3;
-const HDX: u32 = 0;
-
-fn funded_account<T: Config>(name: &'static str, index: u32) -> T::AccountId
-where
-	T::MultiCurrency: MultiCurrencyExtended<T::AccountId, CurrencyId = AssetId, Balance = Balance, Amount = Amount>,
-{
-	let caller: T::AccountId = account(name, index, SEED);
-
-	T::MultiCurrency::update_balance(ASSET_ID, &caller, 2000).unwrap();
-	T::MultiCurrency::update_balance(HDX, &caller, 2000).unwrap();
-
-	caller
-}
-
-fn initialize_pool<T: Config>(
-	caller: T::AccountId,
-	asset: AssetId,
-	amount: Balance,
-	price: Price,
-) -> dispatch::DispatchResultWithPostInfo {
-	ammpool::Pallet::<T>::create_pool(RawOrigin::Signed(caller).into(), HDX, asset, amount, price)?;
-	Ok(().into())
-}
-
-benchmarks! {
-	swap_currency {
-		let maker = funded_account::<T>("maker", 1);
-		initialize_pool::<T>(maker.clone(), ASSET_ID, 1000, Price::from_num(1))?;
-		MultiPaymentModule::<T>::add_new_member(&maker);
-		MultiPaymentModule::<T>::add_currency(RawOrigin::Signed(maker).into(), ASSET_ID)?;
-
-		let caller = funded_account::<T>("caller", 2);
-		MultiPaymentModule::<T>::set_currency(RawOrigin::Signed(caller.clone()).into(), ASSET_ID)?;
-
-	}: { MultiPaymentModule::<T>::swap_currency(&caller, 10)? }
-	verify{
-		assert_eq!(MultiPaymentModule::<T>::get_currency(caller.clone()), Some(ASSET_ID));
-		assert_eq!(T::MultiCurrency::free_balance(ASSET_ID, &caller),2000 - 10 -1 );
-	}
-
-	set_currency {
-		let maker = funded_account::<T>("maker", 1);
-		MultiPaymentModule::<T>::add_new_member(&maker);
-		MultiPaymentModule::<T>::add_currency(RawOrigin::Signed(maker).into(), ASSET_ID)?;
-
-		let caller = funded_account::<T>("caller", 123);
-
-		let currency_id: u32 = ASSET_ID;
-
-	}: { MultiPaymentModule::<T>::set_currency(RawOrigin::Signed(caller.clone()).into(), currency_id)? }
-	verify{
-		assert_eq!(MultiPaymentModule::<T>::get_currency(caller), Some(currency_id));
-	}
-
-	add_currency {
-		let caller = funded_account::<T>("maker", 1);
-		MultiPaymentModule::<T>::add_new_member(&caller);
-	}: { MultiPaymentModule::<T>::add_currency(RawOrigin::Signed(caller.clone()).into(), 10)? }
-	verify {
-		assert_eq!(MultiPaymentModule::<T>::currencies(), OrderedSet::from(vec![10]));
-	}
-
-	remove_currency {
-		let caller = funded_account::<T>("maker", 1);
-		MultiPaymentModule::<T>::add_new_member(&caller);
-		MultiPaymentModule::<T>::add_currency(RawOrigin::Signed(caller.clone()).into(), 10)?;
-
-		assert_eq!(MultiPaymentModule::<T>::currencies(), OrderedSet::from(vec![10]));
-
-	}: { MultiPaymentModule::<T>::remove_currency(RawOrigin::Signed(caller.clone()).into(), 10)? }
-	verify {
-		assert_eq!(MultiPaymentModule::<T>::currencies(), OrderedSet::<AssetId>::new())
-	}
-
-	add_member{
-		let member = funded_account::<T>("newmember", 10);
-	}: { MultiPaymentModule::<T>::add_member(RawOrigin::Root.into(), member.clone())? }
-	verify {
-		assert_eq!(MultiPaymentModule::<T>::authorities(), vec![member]);
-	}
-
-	remove_member{
-		let member = funded_account::<T>("newmember", 10);
-		MultiPaymentModule::<T>::add_new_member(&member);
-	}: { MultiPaymentModule::<T>::remove_member(RawOrigin::Root.into(), member.clone())? }
-	verify {
-		assert_eq!(MultiPaymentModule::<T>::authorities(), vec![]);
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::mock::{ExtBuilder, Test};
-	use frame_support::assert_ok;
-
-	#[test]
-	fn test_benchmarks() {
-		ExtBuilder::default().base_weight(5).build().execute_with(|| {
-			assert_ok!(test_benchmark_swap_currency::<Test>());
-			assert_ok!(test_benchmark_set_currency::<Test>());
-			assert_ok!(test_benchmark_add_currency::<Test>());
-			assert_ok!(test_benchmark_remove_currency::<Test>());
-			assert_ok!(test_benchmark_add_member::<Test>());
-			assert_ok!(test_benchmark_remove_member::<Test>());
-		});
-	}
-}
diff --git a/pallets/transaction-multi-payment/benchmarking/src/mock.rs b/pallets/transaction-multi-payment/benchmarking/src/mock.rs
deleted file mode 100644
index 21b900e8370..00000000000
--- a/pallets/transaction-multi-payment/benchmarking/src/mock.rs
+++ /dev/null
@@ -1,243 +0,0 @@
-#![cfg(test)]
-
-use crate::Config;
-use frame_support::parameter_types;
-use frame_support::traits::GenesisBuild;
-use frame_system as system;
-use orml_traits::parameter_type_with_key;
-use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup, Zero},
-};
-
-use frame_support::weights::IdentityFee;
-use orml_currencies::BasicCurrencyAdapter;
-use pallet_transaction_multi_payment::MultiCurrencyAdapter;
-use primitives::{Amount, AssetId, Balance};
-
-use frame_support::traits::Get;
-use pallet_amm::AssetPairAccountIdFor;
-use std::cell::RefCell;
-
-use frame_benchmarking::frame_support::weights::Pays;
-use orml_utilities::OrderedSet;
-use primitives::fee;
-
-pub type AccountId = u64;
-
-thread_local! {
-		static EXTRINSIC_BASE_WEIGHT: RefCell<u64> = RefCell::new(0);
-}
-
-pub struct ExtrinsicBaseWeight;
-impl Get<u64> for ExtrinsicBaseWeight {
-	fn get() -> u64 {
-		EXTRINSIC_BASE_WEIGHT.with(|v| *v.borrow())
-	}
-}
-
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
-type Block = frame_system::mocking::MockBlock<Test>;
-
-frame_support::construct_runtime!(
-		pub enum Test where
-		 Block = Block,
-		 NodeBlock = Block,
-		 UncheckedExtrinsic = UncheckedExtrinsic,
-		 {
-				 System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-				 PaymentPallet: pallet_transaction_multi_payment::{Pallet, Call, Storage, Event<T>},
-				 AMMPallet: pallet_amm::{Pallet, Call, Storage, Event<T>},
-				 Balances: pallet_balances::{Pallet,Call, Storage,Config<T>, Event<T>},
-				 Currencies: orml_currencies::{Pallet, Event<T>},
-				 Tokens: orml_tokens::{Pallet, Event<T>},
-				 AssetRegistry: pallet_asset_registry::{Pallet, Storage},
-		 }
-
-);
-
-parameter_types! {
-	pub const BlockHashCount: u64 = 250;
-
-	pub const HdxAssetId: u32 = 0;
-	pub const ExistentialDeposit: u128 = 0;
-	pub const MaxLocks: u32 = 50;
-	pub const TransactionByteFee: Balance = 1;
-	pub ExchangeFeeRate: fee::Fee = fee::Fee::default();
-	pub PayForSetCurrency : Pays = Pays::No;
-}
-
-impl system::Config for Test {
-	type BaseCallFilter = ();
-	type BlockWeights = ();
-	type BlockLength = ();
-	type Origin = Origin;
-	type Call = Call;
-	type Index = u64;
-	type BlockNumber = u64;
-	type Hash = H256;
-	type Hashing = BlakeTwo256;
-	type AccountId = u64;
-	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
-	type Event = Event;
-	type BlockHashCount = BlockHashCount;
-	type DbWeight = ();
-	type Version = ();
-	type PalletInfo = PalletInfo;
-	type AccountData = pallet_balances::AccountData<u128>;
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type SystemWeightInfo = ();
-	type SS58Prefix = ();
-	type OnSetCode = ();
-}
-impl Config for Test {}
-
-impl pallet_transaction_multi_payment::Config for Test {
-	type Event = Event;
-	type Currency = Balances;
-	type MultiCurrency = Currencies;
-	type AMMPool = AMMPallet;
-	type WeightInfo = ();
-	type WithdrawFeeForSetCurrency = PayForSetCurrency;
-	type WeightToFee = IdentityFee<Balance>;
-}
-
-impl pallet_asset_registry::Config for Test {
-	type AssetId = AssetId;
-}
-
-impl pallet_balances::Config for Test {
-	/// The type for recording an account's balance.
-	type Balance = Balance;
-	type DustRemoval = ();
-	/// The ubiquitous event type.
-	type Event = Event;
-	type ExistentialDeposit = ExistentialDeposit;
-	type AccountStore = System;
-	type WeightInfo = ();
-	type MaxLocks = MaxLocks;
-}
-
-impl pallet_transaction_payment::Config for Test {
-	type OnChargeTransaction = MultiCurrencyAdapter<Balances, (), PaymentPallet>;
-	type TransactionByteFee = TransactionByteFee;
-	type WeightToFee = IdentityFee<Balance>;
-	type FeeMultiplierUpdate = ();
-}
-
-pub struct AssetPairAccountIdTest();
-
-impl AssetPairAccountIdFor<AssetId, u64> for AssetPairAccountIdTest {
-	fn from_assets(asset_a: AssetId, asset_b: AssetId) -> u64 {
-		let mut a = asset_a as u128;
-		let mut b = asset_b as u128;
-		if a > b {
-			let tmp = a;
-			a = b;
-			b = tmp;
-		}
-		return (a * 1000 + b) as u64;
-	}
-}
-
-impl pallet_amm::Config for Test {
-	type Event = Event;
-	type AssetPairAccountId = AssetPairAccountIdTest;
-	type Currency = Currencies;
-	type HDXAssetId = HdxAssetId;
-	type WeightInfo = ();
-	type GetExchangeFee = ExchangeFeeRate;
-}
-
-parameter_type_with_key! {
-	pub ExistentialDeposits: |_currency_id: AssetId| -> Balance {
-		Zero::zero()
-	};
-}
-
-impl orml_tokens::Config for Test {
-	type Event = Event;
-	type Balance = Balance;
-	type Amount = Amount;
-	type CurrencyId = AssetId;
-	type WeightInfo = ();
-	type ExistentialDeposits = ExistentialDeposits;
-	type OnDust = ();
-}
-
-impl orml_currencies::Config for Test {
-	type Event = Event;
-	type MultiCurrency = Tokens;
-	type NativeCurrency = BasicCurrencyAdapter<Test, Balances, Amount, u32>;
-	type GetNativeCurrencyId = HdxAssetId;
-	type WeightInfo = ();
-}
-
-pub struct ExtBuilder {
-	base_weight: u64,
-	native_balances: Vec<(AccountId, Balance)>,
-	endowed_accounts: Vec<(AccountId, AssetId, Balance)>,
-}
-
-impl Default for ExtBuilder {
-	fn default() -> Self {
-		Self {
-			base_weight: 0,
-			native_balances: vec![(1, 100_000)],
-			endowed_accounts: vec![],
-		}
-	}
-}
-
-impl ExtBuilder {
-	pub fn base_weight(mut self, base_weight: u64) -> Self {
-		self.base_weight = base_weight;
-		self
-	}
-	fn set_constants(&self) {
-		EXTRINSIC_BASE_WEIGHT.with(|v| *v.borrow_mut() = self.base_weight);
-	}
-	pub fn build(self) -> sp_io::TestExternalities {
-		self.set_constants();
-		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-
-		pallet_balances::GenesisConfig::<Test> {
-			balances: self.native_balances,
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-		orml_tokens::GenesisConfig::<Test> {
-			endowed_accounts: self.endowed_accounts,
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-		let core_asset: u32 = 0;
-		let mut buf: Vec<u8> = Vec::new();
-
-		buf.extend_from_slice(&core_asset.to_le_bytes());
-		buf.extend_from_slice(b"HDT");
-		buf.extend_from_slice(&core_asset.to_le_bytes());
-
-		pallet_asset_registry::GenesisConfig::<Test> {
-			core_asset_id: 0,
-			next_asset_id: 2,
-			asset_ids: vec![(buf.to_vec(), 1)],
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-		pallet_transaction_multi_payment::GenesisConfig::<Test> {
-			currencies: OrderedSet::from(vec![]),
-			authorities: vec![],
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-		t.into()
-	}
-}
diff --git a/pallets/transaction-multi-payment/src/lib.rs b/pallets/transaction-multi-payment/src/lib.rs
deleted file mode 100644
index de8ebbf395e..00000000000
--- a/pallets/transaction-multi-payment/src/lib.rs
+++ /dev/null
@@ -1,391 +0,0 @@
-#![cfg_attr(not(feature = "std"), no_std)]
-#![allow(clippy::unused_unit)]
-
-pub mod weights;
-
-use weights::WeightInfo;
-
-#[cfg(test)]
-mod mock;
-
-#[cfg(test)]
-mod tests;
-
-use frame_support::{
-	dispatch::DispatchResult,
-	ensure,
-	traits::{Currency, ExistenceRequirement, Get, Imbalance, OnUnbalanced, WithdrawReasons},
-	transactional,
-	weights::DispatchClass,
-	weights::WeightToFeePolynomial,
-};
-use frame_system::{ensure_root, ensure_signed};
-use sp_runtime::{
-	traits::{DispatchInfoOf, PostDispatchInfoOf, Saturating, Zero},
-	transaction_validity::{InvalidTransaction, TransactionValidityError},
-};
-use sp_std::prelude::*;
-
-use pallet_transaction_payment::OnChargeTransaction;
-use sp_std::marker::PhantomData;
-
-use frame_support::weights::{Pays, Weight};
-use orml_traits::{MultiCurrency, MultiCurrencyExtended};
-use primitives::asset::AssetPair;
-use primitives::traits::{CurrencySwap, AMM};
-use primitives::{Amount, AssetId, Balance, CORE_ASSET_ID};
-
-use orml_utilities::OrderedSet;
-
-type NegativeImbalanceOf<C, T> = <C as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
-// Re-export pallet items so that they can be accessed from the crate namespace.
-pub use pallet::*;
-
-#[frame_support::pallet]
-pub mod pallet {
-	use super::*;
-	use frame_support::pallet_prelude::*;
-	use frame_system::pallet_prelude::OriginFor;
-
-	#[pallet::pallet]
-	pub struct Pallet<T>(_);
-
-	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {}
-
-	#[pallet::config]
-	pub trait Config: frame_system::Config + pallet_transaction_payment::Config {
-		/// Because this pallet emits events, it depends on the runtime's definition of an event.
-		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
-
-		/// The currency type in which fees will be paid.
-		type Currency: Currency<Self::AccountId> + Send + Sync;
-
-		/// Multi Currency
-		type MultiCurrency: MultiCurrency<Self::AccountId>
-			+ MultiCurrencyExtended<Self::AccountId, CurrencyId = AssetId, Balance = Balance, Amount = Amount>;
-
-		/// AMM pool to swap for native currency
-		type AMMPool: AMM<Self::AccountId, AssetId, AssetPair, Balance>;
-
-		/// Weight information for the extrinsics.
-		type WeightInfo: WeightInfo;
-
-		/// Should fee be paid for setting a currency
-		type WithdrawFeeForSetCurrency: Get<Pays>;
-
-		/// Convert a weight value into a deductible fee based on the currency type.
-		type WeightToFee: WeightToFeePolynomial<Balance = Balance>;
-	}
-
-	#[pallet::event]
-	#[pallet::generate_deposit(pub(crate) fn deposit_event)]
-	pub enum Event<T: Config> {
-		/// CurrencySet
-		/// [who, currency]
-		CurrencySet(T::AccountId, AssetId),
-
-		/// New accepted currency added
-		/// [who, currency]
-		CurrencyAdded(T::AccountId, AssetId),
-
-		/// Accepted currency removed
-		/// [who, currency]
-		CurrencyRemoved(T::AccountId, AssetId),
-
-		/// Member added
-		/// [who]
-		MemberAdded(T::AccountId),
-
-		/// Member removed
-		/// [who]
-		MemberRemoved(T::AccountId),
-	}
-
-	#[pallet::error]
-	pub enum Error<T> {
-		/// Selected currency is not supported
-		UnsupportedCurrency,
-
-		/// Zero Balance of selected currency
-		ZeroBalance,
-
-		/// Not allowed to add or remove accepted currency
-		NotAllowed,
-
-		/// Currency being added is already in the list of accpeted currencies
-		AlreadyAccepted,
-
-		/// Currency being added is already in the list of accpeted currencies
-		CoreAssetNotAllowed,
-
-		/// Account is already a member of authorities
-		AlreadyMember,
-
-		/// Account is not a member of authorities
-		NotAMember,
-	}
-
-	/// Account currency map
-	#[pallet::storage]
-	#[pallet::getter(fn get_currency)]
-	pub type AccountCurrencyMap<T: Config> = StorageMap<_, Blake2_128Concat, T::AccountId, Option<AssetId>, ValueQuery>;
-
-	/// Curated list of currencies which fees can be paid with
-	#[pallet::storage]
-	#[pallet::getter(fn currencies)]
-	pub type AcceptedCurrencies<T: Config> = StorageValue<_, OrderedSet<AssetId>, ValueQuery>;
-
-	#[pallet::storage]
-	#[pallet::getter(fn authorities)]
-	pub type Authorities<T: Config> = StorageValue<_, Vec<T::AccountId>, ValueQuery>;
-
-	#[pallet::genesis_config]
-	pub struct GenesisConfig<T: Config> {
-		pub currencies: OrderedSet<AssetId>,
-		pub authorities: Vec<T::AccountId>,
-	}
-
-	#[cfg(feature = "std")]
-	impl<T: Config> Default for GenesisConfig<T> {
-		fn default() -> Self {
-			GenesisConfig {
-				currencies: OrderedSet::new(),
-				authorities: vec![],
-			}
-		}
-	}
-
-	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
-		fn build(&self) {
-			Authorities::<T>::put(self.authorities.clone());
-			AcceptedCurrencies::<T>::put(self.currencies.clone());
-		}
-	}
-	#[pallet::call]
-	impl<T: Config> Pallet<T> {
-		#[pallet::weight((<T as Config>::WeightInfo::set_currency(), DispatchClass::Normal, Pays::No))]
-		#[transactional]
-		pub fn set_currency(origin: OriginFor<T>, currency: AssetId) -> DispatchResultWithPostInfo {
-			let who = ensure_signed(origin)?;
-
-			if currency == CORE_ASSET_ID || Self::currencies().contains(&currency) {
-				if T::MultiCurrency::free_balance(currency, &who) == Balance::zero() {
-					return Err(Error::<T>::ZeroBalance.into());
-				}
-
-				<AccountCurrencyMap<T>>::insert(who.clone(), Some(currency));
-
-				if T::WithdrawFeeForSetCurrency::get() == Pays::Yes {
-					Self::withdraw_set_fee(&who, currency)?;
-				}
-
-				Self::deposit_event(Event::CurrencySet(who, currency));
-
-				return Ok(().into());
-			}
-
-			Err(Error::<T>::UnsupportedCurrency.into())
-		}
-
-		#[pallet::weight((<T as Config>::WeightInfo::add_currency(), DispatchClass::Normal, Pays::No))]
-		pub fn add_currency(origin: OriginFor<T>, currency: AssetId) -> DispatchResultWithPostInfo {
-			let who = ensure_signed(origin)?;
-
-			ensure!(currency != CORE_ASSET_ID, Error::<T>::CoreAssetNotAllowed);
-
-			// Only selected accounts can perform this action
-			ensure!(Self::authorities().contains(&who), Error::<T>::NotAllowed);
-
-			if AcceptedCurrencies::<T>::mutate(|x| x.insert(currency)) {
-				Self::deposit_event(Event::CurrencyAdded(who, currency));
-				return Ok(().into());
-			}
-			Err(Error::<T>::AlreadyAccepted.into())
-		}
-
-		/// Remove currency from the list of supported currencies
-		/// Only selected members can perform this action
-		#[pallet::weight((<T as Config>::WeightInfo::remove_currency(), DispatchClass::Normal, Pays::No))]
-		pub fn remove_currency(origin: OriginFor<T>, currency: AssetId) -> DispatchResultWithPostInfo {
-			let who = ensure_signed(origin)?;
-
-			ensure!(currency != CORE_ASSET_ID, Error::<T>::CoreAssetNotAllowed);
-
-			// Only selected accounts can perform this action
-			ensure!(Self::authorities().contains(&who), Error::<T>::NotAllowed);
-
-			if AcceptedCurrencies::<T>::mutate(|x| x.remove(&currency)) {
-				Self::deposit_event(Event::CurrencyRemoved(who, currency));
-				return Ok(().into());
-			}
-
-			Err(Error::<T>::UnsupportedCurrency.into())
-		}
-
-		/// Add an account as member to list of authorities who can manage list of accepted currencies
-		#[pallet::weight((<T as Config>::WeightInfo::add_member(), DispatchClass::Normal, Pays::No))]
-		pub fn add_member(origin: OriginFor<T>, member: T::AccountId) -> DispatchResultWithPostInfo {
-			ensure_root(origin)?;
-
-			ensure!(!Self::authorities().contains(&member), Error::<T>::AlreadyMember);
-
-			Self::add_new_member(&member);
-
-			Self::deposit_event(Event::MemberAdded(member));
-
-			Ok(().into())
-		}
-
-		#[pallet::weight((<T as Config>::WeightInfo::remove_member(), DispatchClass::Normal, Pays::No))]
-		pub fn remove_member(origin: OriginFor<T>, member: T::AccountId) -> DispatchResultWithPostInfo {
-			ensure_root(origin)?;
-
-			ensure!(Self::authorities().contains(&member), Error::<T>::NotAMember);
-
-			Authorities::<T>::mutate(|x| x.retain(|val| *val != member));
-
-			Self::deposit_event(Event::MemberRemoved(member));
-
-			Ok(().into())
-		}
-	}
-}
-
-impl<T: Config> Pallet<T> {
-	pub fn swap_currency(who: &T::AccountId, fee: Balance) -> DispatchResult {
-		// Let's determine currency in which user would like to pay the fee
-		let fee_currency = match Pallet::<T>::get_currency(who) {
-			Some(c) => c,
-			_ => CORE_ASSET_ID,
-		};
-
-		// If not native currency, let's buy CORE asset first and then pay with that.
-		if fee_currency != CORE_ASSET_ID {
-			T::AMMPool::buy(
-				&who,
-				AssetPair {
-					asset_out: CORE_ASSET_ID,
-					asset_in: fee_currency,
-				},
-				fee,
-				2u128 * fee,
-				false,
-			)?;
-		}
-
-		Ok(())
-	}
-
-	pub fn add_new_member(who: &T::AccountId) {
-		Authorities::<T>::mutate(|x| x.push(who.clone()));
-	}
-
-	pub fn withdraw_set_fee(who: &T::AccountId, currency: AssetId) -> DispatchResult {
-		let base_fee = Self::weight_to_fee(T::BlockWeights::get().get(DispatchClass::Normal).base_extrinsic);
-		let adjusted_weight_fee = Self::weight_to_fee(T::WeightInfo::set_currency());
-		let fee = base_fee.saturating_add(adjusted_weight_fee);
-
-		Self::swap_currency(who, fee)?;
-		T::MultiCurrency::withdraw(currency, who, fee)?;
-
-		Ok(())
-	}
-
-	fn weight_to_fee(weight: Weight) -> Balance {
-		// cap the weight to the maximum defined in runtime, otherwise it will be the
-		// `Bounded` maximum of its data type, which is not desired.
-		let capped_weight: Weight = weight.min(T::BlockWeights::get().max_block);
-		<T as Config>::WeightToFee::calc(&capped_weight)
-	}
-}
-
-impl<T: Config> CurrencySwap<<T as frame_system::Config>::AccountId, Balance> for Pallet<T> {
-	fn swap_currency(who: &T::AccountId, fee: u128) -> DispatchResult {
-		Self::swap_currency(who, fee)
-	}
-}
-
-/// Implements the transaction payment for native as well as non-native currencies
-pub struct MultiCurrencyAdapter<C, OU, SW>(PhantomData<(C, OU, SW)>);
-
-impl<T, C, OU, SW> OnChargeTransaction<T> for MultiCurrencyAdapter<C, OU, SW>
-where
-	T: Config,
-	T::TransactionByteFee: Get<<C as Currency<<T as frame_system::Config>::AccountId>>::Balance>,
-	C: Currency<<T as frame_system::Config>::AccountId>,
-	C::PositiveImbalance:
-		Imbalance<<C as Currency<<T as frame_system::Config>::AccountId>>::Balance, Opposite = C::NegativeImbalance>,
-	C::NegativeImbalance:
-		Imbalance<<C as Currency<<T as frame_system::Config>::AccountId>>::Balance, Opposite = C::PositiveImbalance>,
-	OU: OnUnbalanced<NegativeImbalanceOf<C, T>>,
-	C::Balance: Into<Balance>,
-	SW: CurrencySwap<T::AccountId, Balance>,
-{
-	type LiquidityInfo = Option<NegativeImbalanceOf<C, T>>;
-	type Balance = <C as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-
-	/// Withdraw the predicted fee from the transaction origin.
-	///
-	/// Note: The `fee` already includes the `tip`.
-	fn withdraw_fee(
-		who: &T::AccountId,
-		_call: &T::Call,
-		_info: &DispatchInfoOf<T::Call>,
-		fee: Self::Balance,
-		tip: Self::Balance,
-	) -> Result<Self::LiquidityInfo, TransactionValidityError> {
-		if fee.is_zero() {
-			return Ok(None);
-		}
-
-		let withdraw_reason = if tip.is_zero() {
-			WithdrawReasons::TRANSACTION_PAYMENT
-		} else {
-			WithdrawReasons::TRANSACTION_PAYMENT | WithdrawReasons::TIP
-		};
-
-		if SW::swap_currency(&who, fee.into()).is_err() {
-			return Err(InvalidTransaction::Payment.into());
-		}
-
-		match C::withdraw(who, fee, withdraw_reason, ExistenceRequirement::KeepAlive) {
-			Ok(imbalance) => Ok(Some(imbalance)),
-			Err(_) => Err(InvalidTransaction::Payment.into()),
-		}
-	}
-
-	/// Hand the fee and the tip over to the `[OnUnbalanced]` implementation.
-	/// Since the predicted fee might have been too high, parts of the fee may
-	/// be refunded.
-	///
-	/// Note: The `fee` already includes the `tip`.
-	/// Note: This is the default implementation
-	fn correct_and_deposit_fee(
-		who: &T::AccountId,
-		_dispatch_info: &DispatchInfoOf<T::Call>,
-		_post_info: &PostDispatchInfoOf<T::Call>,
-		corrected_fee: Self::Balance,
-		tip: Self::Balance,
-		already_withdrawn: Self::LiquidityInfo,
-	) -> Result<(), TransactionValidityError> {
-		if let Some(paid) = already_withdrawn {
-			// Calculate how much refund we should return
-			let refund_amount = paid.peek().saturating_sub(corrected_fee);
-			// refund to the the account that paid the fees. If this fails, the
-			// account might have dropped below the existential balance. In
-			// that case we don't refund anything.
-			let refund_imbalance =
-				C::deposit_into_existing(&who, refund_amount).unwrap_or_else(|_| C::PositiveImbalance::zero());
-			// merge the imbalance caused by paying the fees and refunding parts of it again.
-			let adjusted_paid = paid
-				.offset(refund_imbalance)
-				.map_err(|_| TransactionValidityError::Invalid(InvalidTransaction::Payment))?;
-			// Call someone else to handle the imbalance (fee and tip separately)
-			let imbalances = adjusted_paid.split(tip);
-			OU::on_unbalanceds(Some(imbalances.0).into_iter().chain(Some(imbalances.1)));
-		}
-		Ok(())
-	}
-}
diff --git a/pallets/transaction-multi-payment/src/mock.rs b/pallets/transaction-multi-payment/src/mock.rs
deleted file mode 100644
index 1e2ab6ad4f3..00000000000
--- a/pallets/transaction-multi-payment/src/mock.rs
+++ /dev/null
@@ -1,285 +0,0 @@
-use super::*;
-use crate as multi_payment;
-use crate::{Config, MultiCurrencyAdapter};
-use frame_support::{parameter_types, weights::DispatchClass};
-use frame_system as system;
-use orml_traits::parameter_type_with_key;
-use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup, Zero},
-	Perbill,
-};
-
-use frame_support::weights::IdentityFee;
-use frame_support::weights::Weight;
-use orml_currencies::BasicCurrencyAdapter;
-use primitives::{Amount, AssetId, Balance};
-
-use pallet_amm::AssetPairAccountIdFor;
-use std::cell::RefCell;
-
-use frame_support::traits::{GenesisBuild, Get};
-use primitives::fee;
-
-pub type AccountId = u64;
-
-pub const INITIAL_BALANCE: Balance = 1000_000_000_000_000u128;
-
-pub const ALICE: AccountId = 1;
-pub const BOB: AccountId = 2;
-
-pub const HDX: AssetId = 0;
-pub const SUPPORTED_CURRENCY_NO_BALANCE: AssetId = 2000;
-pub const SUPPORTED_CURRENCY_WITH_BALANCE: AssetId = 3000;
-pub const NOT_SUPPORTED_CURRENCY: AssetId = 4000;
-
-const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
-const MAX_BLOCK_WEIGHT: Weight = 1024;
-
-thread_local! {
-		static EXTRINSIC_BASE_WEIGHT: RefCell<u64> = RefCell::new(0);
-}
-
-pub struct ExtrinsicBaseWeight;
-impl Get<u64> for ExtrinsicBaseWeight {
-	fn get() -> u64 {
-		EXTRINSIC_BASE_WEIGHT.with(|v| *v.borrow())
-	}
-}
-
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
-type Block = frame_system::mocking::MockBlock<Test>;
-
-frame_support::construct_runtime!(
-	pub enum Test where
-	 Block = Block,
-	 NodeBlock = Block,
-	 UncheckedExtrinsic = UncheckedExtrinsic,
-	 {
-		 System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		 PaymentPallet: multi_payment::{Pallet, Call, Storage, Event<T>},
-		 AMMPallet: pallet_amm::{Pallet, Call, Storage, Event<T>},
-		 Balances: pallet_balances::{Pallet,Call, Storage,Config<T>, Event<T>},
-		 Currencies: orml_currencies::{Pallet, Event<T>},
-		 AssetRegistry: pallet_asset_registry::{Pallet, Storage},
-		 Tokens: orml_tokens::{Pallet, Event<T>},
-	 }
-
-);
-
-parameter_types! {
-	pub const BlockHashCount: u64 = 250;
-	pub const SS58Prefix: u8 = 63;
-
-	pub const HdxAssetId: u32 = 0;
-	pub const ExistentialDeposit: u128 = 0;
-	pub const MaxLocks: u32 = 50;
-	pub const TransactionByteFee: Balance = 1;
-
-	pub RuntimeBlockWeights: system::limits::BlockWeights = system::limits::BlockWeights::builder()
-		.base_block(10)
-		.for_class(DispatchClass::all(), |weights| {
-			weights.base_extrinsic = ExtrinsicBaseWeight::get();
-		})
-		.for_class(DispatchClass::Normal, |weights| {
-			weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAX_BLOCK_WEIGHT);
-		})
-		.for_class(DispatchClass::Operational, |weights| {
-			weights.max_total = Some(MAX_BLOCK_WEIGHT);
-			weights.reserved = Some(
-				MAX_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAX_BLOCK_WEIGHT
-			);
-		})
-		.avg_block_initialization(Perbill::from_percent(0))
-		.build_or_panic();
-
-	pub ExchangeFeeRate: fee::Fee = fee::Fee::default();
-	 pub PayForSetCurrency : Pays = Pays::No;
-}
-
-impl system::Config for Test {
-	type BaseCallFilter = ();
-	type BlockWeights = RuntimeBlockWeights;
-	type BlockLength = ();
-	type Origin = Origin;
-	type Call = Call;
-	type Index = u64;
-	type BlockNumber = u64;
-	type Hash = H256;
-	type Hashing = BlakeTwo256;
-	type AccountId = u64;
-	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
-	type Event = Event;
-	type BlockHashCount = BlockHashCount;
-	type DbWeight = ();
-	type Version = ();
-	type PalletInfo = PalletInfo;
-	type AccountData = pallet_balances::AccountData<u128>;
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type SystemWeightInfo = ();
-	type SS58Prefix = SS58Prefix;
-	type OnSetCode = ();
-}
-
-impl Config for Test {
-	type Event = Event;
-	type Currency = Balances;
-	type MultiCurrency = Currencies;
-	type AMMPool = AMMPallet;
-	type WeightInfo = ();
-	type WithdrawFeeForSetCurrency = PayForSetCurrency;
-	type WeightToFee = IdentityFee<Balance>;
-}
-
-impl pallet_asset_registry::Config for Test {
-	type AssetId = AssetId;
-}
-
-impl pallet_balances::Config for Test {
-	type MaxLocks = MaxLocks;
-	/// The type for recording an account's balance.
-	type Balance = Balance;
-	/// The ubiquitous event type.
-	type Event = Event;
-	type DustRemoval = ();
-	type ExistentialDeposit = ExistentialDeposit;
-	type AccountStore = System;
-	type WeightInfo = ();
-}
-
-impl pallet_transaction_payment::Config for Test {
-	type OnChargeTransaction = MultiCurrencyAdapter<Balances, (), PaymentPallet>;
-	type TransactionByteFee = TransactionByteFee;
-	type WeightToFee = IdentityFee<Balance>;
-	type FeeMultiplierUpdate = ();
-}
-pub struct AssetPairAccountIdTest();
-
-impl AssetPairAccountIdFor<AssetId, u64> for AssetPairAccountIdTest {
-	fn from_assets(asset_a: AssetId, asset_b: AssetId) -> u64 {
-		let mut a = asset_a as u128;
-		let mut b = asset_b as u128;
-		if a > b {
-			let tmp = a;
-			a = b;
-			b = tmp;
-		}
-		return (a * 1000 + b) as u64;
-	}
-}
-
-impl pallet_amm::Config for Test {
-	type Event = Event;
-	type AssetPairAccountId = AssetPairAccountIdTest;
-	type Currency = Currencies;
-	type HDXAssetId = HdxAssetId;
-	type WeightInfo = ();
-	type GetExchangeFee = ExchangeFeeRate;
-}
-
-parameter_type_with_key! {
-	pub ExistentialDeposits: |_currency_id: AssetId| -> Balance {
-		Zero::zero()
-	};
-}
-
-impl orml_tokens::Config for Test {
-	type Event = Event;
-	type Balance = Balance;
-	type Amount = Amount;
-	type CurrencyId = AssetId;
-	type WeightInfo = ();
-	type ExistentialDeposits = ExistentialDeposits;
-	type OnDust = ();
-}
-
-impl orml_currencies::Config for Test {
-	type Event = Event;
-	type MultiCurrency = Tokens;
-	type NativeCurrency = BasicCurrencyAdapter<Test, Balances, Amount, u32>;
-	type GetNativeCurrencyId = HdxAssetId;
-	type WeightInfo = ();
-}
-
-pub struct ExtBuilder {
-	base_weight: u64,
-	native_balances: Vec<(AccountId, Balance)>,
-	endowed_accounts: Vec<(AccountId, AssetId, Balance)>,
-	payment_authority: AccountId,
-}
-
-impl Default for ExtBuilder {
-	fn default() -> Self {
-		Self {
-			base_weight: 0,
-			payment_authority: BOB,
-			native_balances: vec![(ALICE, INITIAL_BALANCE), (BOB, 0)],
-			endowed_accounts: vec![
-				(ALICE, HDX, INITIAL_BALANCE),
-				(ALICE, SUPPORTED_CURRENCY_NO_BALANCE, 0u128), // Used for insufficient balance testing
-				(ALICE, SUPPORTED_CURRENCY_WITH_BALANCE, INITIAL_BALANCE),
-			],
-		}
-	}
-}
-
-impl ExtBuilder {
-	pub fn base_weight(mut self, base_weight: u64) -> Self {
-		self.base_weight = base_weight;
-		self
-	}
-	pub fn account_native_balance(mut self, account: AccountId, balance: Balance) -> Self {
-		self.native_balances.push((account, balance));
-		self
-	}
-	pub fn account_tokens(mut self, account: AccountId, asset: AssetId, balance: Balance) -> Self {
-		self.endowed_accounts.push((account, asset, balance));
-		self
-	}
-	fn set_constants(&self) {
-		EXTRINSIC_BASE_WEIGHT.with(|v| *v.borrow_mut() = self.base_weight);
-	}
-	pub fn build(self) -> sp_io::TestExternalities {
-		self.set_constants();
-		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-
-		pallet_balances::GenesisConfig::<Test> {
-			balances: self.native_balances,
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-		orml_tokens::GenesisConfig::<Test> {
-			endowed_accounts: self.endowed_accounts,
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-		let core_asset: u32 = 0;
-		let mut buf: Vec<u8> = Vec::new();
-
-		buf.extend_from_slice(&core_asset.to_le_bytes());
-		buf.extend_from_slice(b"HDT");
-		buf.extend_from_slice(&core_asset.to_le_bytes());
-
-		pallet_asset_registry::GenesisConfig::<Test> {
-			core_asset_id: 0,
-			next_asset_id: 2,
-			asset_ids: vec![(buf.to_vec(), 1)],
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-		crate::GenesisConfig::<Test> {
-			currencies: OrderedSet::from(vec![SUPPORTED_CURRENCY_NO_BALANCE, SUPPORTED_CURRENCY_WITH_BALANCE]),
-			authorities: vec![self.payment_authority],
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-		t.into()
-	}
-}
diff --git a/pallets/transaction-multi-payment/src/tests.rs b/pallets/transaction-multi-payment/src/tests.rs
deleted file mode 100644
index ecda8836394..00000000000
--- a/pallets/transaction-multi-payment/src/tests.rs
+++ /dev/null
@@ -1,283 +0,0 @@
-pub use crate::{mock::*, Error};
-use frame_support::{assert_noop, assert_ok};
-use pallet_transaction_payment::ChargeTransactionPayment;
-use sp_runtime::traits::SignedExtension;
-
-use frame_support::weights::DispatchInfo;
-use orml_traits::MultiCurrency;
-use orml_utilities::OrderedSet;
-use pallet_balances::Call as BalancesCall;
-use primitives::Price;
-
-const CALL: &<Test as frame_system::Config>::Call = &Call::Balances(BalancesCall::transfer(2, 69));
-
-#[test]
-fn set_unsupported_currency() {
-	ExtBuilder::default().build().execute_with(|| {
-		assert_noop!(
-			PaymentPallet::set_currency(Origin::signed(ALICE), NOT_SUPPORTED_CURRENCY),
-			Error::<Test>::UnsupportedCurrency
-		);
-
-		assert_eq!(PaymentPallet::get_currency(ALICE), None);
-	});
-}
-
-#[test]
-fn set_supported_currency() {
-	ExtBuilder::default().build().execute_with(|| {
-		assert_ok!(PaymentPallet::set_currency(
-			Origin::signed(ALICE),
-			SUPPORTED_CURRENCY_WITH_BALANCE
-		),);
-
-		assert_eq!(
-			PaymentPallet::get_currency(ALICE),
-			Some(SUPPORTED_CURRENCY_WITH_BALANCE)
-		);
-	});
-}
-
-#[test]
-fn set_supported_currency_with_no_balance() {
-	ExtBuilder::default().build().execute_with(|| {
-		assert_noop!(
-			PaymentPallet::set_currency(Origin::signed(ALICE), SUPPORTED_CURRENCY_NO_BALANCE),
-			Error::<Test>::ZeroBalance
-		);
-
-		assert_eq!(PaymentPallet::get_currency(ALICE), None);
-	});
-}
-
-#[test]
-fn set_native_currency() {
-	ExtBuilder::default().build().execute_with(|| {
-		assert_ok!(PaymentPallet::set_currency(Origin::signed(ALICE), HDX),);
-
-		assert_eq!(PaymentPallet::get_currency(ALICE), Some(HDX));
-	});
-}
-
-#[test]
-fn set_native_currency_with_no_balance() {
-	ExtBuilder::default().build().execute_with(|| {
-		assert_noop!(
-			PaymentPallet::set_currency(Origin::signed(BOB), HDX),
-			Error::<Test>::ZeroBalance
-		);
-	});
-}
-
-#[test]
-fn fee_payment_in_native_currency() {
-	const CHARLIE: AccountId = 5;
-
-	ExtBuilder::default()
-		.base_weight(5)
-		.account_native_balance(CHARLIE, 100)
-		.build()
-		.execute_with(|| {
-			let len = 10;
-			let info = DispatchInfo {
-				weight: 5,
-				..Default::default()
-			};
-			assert!(ChargeTransactionPayment::<Test>::from(0)
-				.pre_dispatch(&CHARLIE, CALL, &info, len)
-				.is_ok());
-
-			assert_eq!(Balances::free_balance(CHARLIE), 100 - 5 - 5 - 10);
-		});
-}
-
-#[test]
-fn fee_payment_in_native_currency_with_no_balance() {
-	const CHARLIE: AccountId = 5;
-
-	ExtBuilder::default()
-		.base_weight(5)
-		.account_native_balance(CHARLIE, 10)
-		.build()
-		.execute_with(|| {
-			let len = 10;
-			let info = DispatchInfo {
-				weight: 5,
-				..Default::default()
-			};
-			assert!(ChargeTransactionPayment::<Test>::from(0)
-				.pre_dispatch(&CHARLIE, CALL, &info, len)
-				.is_err());
-
-			assert_eq!(Balances::free_balance(CHARLIE), 10);
-		});
-}
-
-#[test]
-fn fee_payment_in_non_native_currency() {
-	const CHARLIE: AccountId = 5;
-
-	ExtBuilder::default()
-		.base_weight(5)
-		.account_native_balance(CHARLIE, 0)
-		.account_tokens(CHARLIE, SUPPORTED_CURRENCY_WITH_BALANCE, 1000)
-		.build()
-		.execute_with(|| {
-			// Make sure Charlie ain't got a penny!
-			assert_eq!(Balances::free_balance(CHARLIE), 0);
-
-			assert_ok!(pallet_amm::Pallet::<Test>::create_pool(
-				Origin::signed(ALICE),
-				HDX,
-				SUPPORTED_CURRENCY_WITH_BALANCE,
-				100000,
-				Price::from_num(1)
-			));
-			assert_ok!(PaymentPallet::set_currency(
-				Origin::signed(CHARLIE),
-				SUPPORTED_CURRENCY_WITH_BALANCE
-			));
-
-			let len = 10;
-			let info = DispatchInfo {
-				weight: 5,
-				..Default::default()
-			};
-
-			assert!(ChargeTransactionPayment::<Test>::from(0)
-				.pre_dispatch(&CHARLIE, CALL, &info, len)
-				.is_ok());
-
-			//Native balance check - Charlie should be still broke!
-			assert_eq!(Balances::free_balance(CHARLIE), 0);
-
-			// token check should be less by the fee amount and -1 as fee in amm swap
-			assert_eq!(
-				Tokens::free_balance(SUPPORTED_CURRENCY_WITH_BALANCE, &CHARLIE),
-				1000 - 20 - 1
-			);
-		});
-}
-
-#[test]
-fn fee_payment_non_native_insufficient_balance() {
-	const CHARLIE: AccountId = 5;
-
-	ExtBuilder::default()
-		.base_weight(5)
-		.account_native_balance(CHARLIE, 0)
-		.account_tokens(CHARLIE, SUPPORTED_CURRENCY_WITH_BALANCE, 10)
-		.build()
-		.execute_with(|| {
-			assert_ok!(pallet_amm::Pallet::<Test>::create_pool(
-				Origin::signed(ALICE),
-				HDX,
-				SUPPORTED_CURRENCY_WITH_BALANCE,
-				100000,
-				Price::from_num(1)
-			));
-
-			assert_ok!(PaymentPallet::set_currency(
-				Origin::signed(CHARLIE),
-				SUPPORTED_CURRENCY_WITH_BALANCE
-			));
-
-			let len = 10;
-			let info = DispatchInfo {
-				weight: 5,
-				..Default::default()
-			};
-
-			assert!(ChargeTransactionPayment::<Test>::from(0)
-				.pre_dispatch(&CHARLIE, CALL, &info, len)
-				.is_err());
-
-			assert_eq!(Tokens::free_balance(SUPPORTED_CURRENCY_WITH_BALANCE, &CHARLIE), 10);
-		});
-}
-
-#[test]
-fn add_new_accepted_currency() {
-	ExtBuilder::default().base_weight(5).build().execute_with(|| {
-		assert_eq!(PaymentPallet::currencies(), OrderedSet::from(vec![2000, 3000]));
-
-		assert_ok!(PaymentPallet::add_currency(Origin::signed(BOB), 100));
-		assert_eq!(PaymentPallet::currencies(), OrderedSet::from(vec![2000, 3000, 100]));
-		assert_noop!(
-			PaymentPallet::add_currency(Origin::signed(ALICE), 1000),
-			Error::<Test>::NotAllowed
-		);
-		assert_noop!(
-			PaymentPallet::add_currency(Origin::signed(BOB), 100),
-			Error::<Test>::AlreadyAccepted
-		);
-		assert_eq!(PaymentPallet::currencies(), OrderedSet::from(vec![2000, 3000, 100]));
-	});
-}
-
-#[test]
-fn removed_accepted_currency() {
-	ExtBuilder::default().base_weight(5).build().execute_with(|| {
-		assert_eq!(PaymentPallet::currencies(), OrderedSet::from(vec![2000, 3000]));
-
-		assert_ok!(PaymentPallet::add_currency(Origin::signed(BOB), 100));
-		assert_eq!(PaymentPallet::currencies(), OrderedSet::from(vec![2000, 3000, 100]));
-
-		assert_noop!(
-			PaymentPallet::remove_currency(Origin::signed(ALICE), 100),
-			Error::<Test>::NotAllowed
-		);
-
-		assert_noop!(
-			PaymentPallet::remove_currency(Origin::signed(BOB), 1000),
-			Error::<Test>::UnsupportedCurrency
-		);
-
-		assert_ok!(PaymentPallet::remove_currency(Origin::signed(BOB), 100));
-
-		assert_noop!(
-			PaymentPallet::remove_currency(Origin::signed(BOB), 100),
-			Error::<Test>::UnsupportedCurrency
-		);
-		assert_eq!(PaymentPallet::currencies(), OrderedSet::from(vec![2000, 3000]));
-	});
-}
-
-#[test]
-fn add_member() {
-	ExtBuilder::default().base_weight(5).build().execute_with(|| {
-		const CHARLIE: AccountId = 3;
-		assert_eq!(PaymentPallet::authorities(), vec![BOB]);
-
-		assert_ok!(PaymentPallet::add_member(Origin::root(), CHARLIE));
-
-		assert_eq!(PaymentPallet::authorities(), vec![BOB, CHARLIE]);
-
-		// Non root should not be allowed
-		assert_noop!(
-			PaymentPallet::add_member(Origin::signed(ALICE), CHARLIE),
-			sp_runtime::traits::BadOrigin
-		);
-
-		// Adding existing member should return error
-		assert_noop!(
-			PaymentPallet::add_member(Origin::root(), CHARLIE),
-			Error::<Test>::AlreadyMember
-		);
-
-		// Non root should not be allowed
-		assert_noop!(
-			PaymentPallet::remove_member(Origin::signed(ALICE), CHARLIE),
-			sp_runtime::traits::BadOrigin
-		);
-
-		assert_ok!(PaymentPallet::remove_member(Origin::root(), CHARLIE));
-
-		assert_eq!(PaymentPallet::authorities(), vec![BOB]);
-
-		assert_noop!(
-			PaymentPallet::remove_member(Origin::root(), CHARLIE),
-			Error::<Test>::NotAMember
-		);
-	});
-}
diff --git a/pallets/transaction-multi-payment/src/weights.rs b/pallets/transaction-multi-payment/src/weights.rs
deleted file mode 100644
index d64ce7f2090..00000000000
--- a/pallets/transaction-multi-payment/src/weights.rs
+++ /dev/null
@@ -1,125 +0,0 @@
-// This file is part of HydraDX-node.
-
-// Copyright (C) 2021 Intergalactic Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Autogenerated weights for transaction_multi_payment
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2021-03-03, STEPS: [5, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
-
-// Executed Command:
-// target/release/hydra-dx
-// benchmark
-// --chain=dev
-// --steps=5
-// --repeat=20
-// --pallet=transaction_multi_payment
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --output=weights.rs
-// --template=.maintain/pallet-weight-template.hbs
-
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
-
-use frame_support::{
-	traits::Get,
-	weights::{constants::RocksDbWeight, Weight},
-};
-use sp_std::marker::PhantomData;
-
-/// Weight functions needed for transaction_multi_payment.
-pub trait WeightInfo {
-	fn swap_currency() -> Weight;
-	fn set_currency() -> Weight;
-	fn add_currency() -> Weight;
-	fn remove_currency() -> Weight;
-	fn add_member() -> Weight;
-	fn remove_member() -> Weight;
-}
-
-/// Weights for transaction_multi_payment using the hydraDX node and recommended hardware.
-pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
-	fn swap_currency() -> Weight {
-		(176_475_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
-			.saturating_add(T::DbWeight::get().writes(4 as Weight))
-	}
-	fn set_currency() -> Weight {
-		(44_552_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn add_currency() -> Weight {
-		(34_724_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn remove_currency() -> Weight {
-		(35_529_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn add_member() -> Weight {
-		(30_411_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn remove_member() -> Weight {
-		(33_172_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-}
-
-// For backwards compatibility and tests
-impl WeightInfo for () {
-	fn swap_currency() -> Weight {
-		(176_475_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
-	}
-	fn set_currency() -> Weight {
-		(44_552_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-	}
-	fn add_currency() -> Weight {
-		(34_724_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-	}
-	fn remove_currency() -> Weight {
-		(35_529_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-	}
-	fn add_member() -> Weight {
-		(30_411_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-	}
-	fn remove_member() -> Weight {
-		(33_172_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-	}
-}
diff --git a/rococo-local/3parachains.json b/rococo-local/3parachains.json
index d7c8d4448f5..895777f3532 100644
--- a/rococo-local/3parachains.json
+++ b/rococo-local/3parachains.json
@@ -23,301 +23,69 @@
         "wsPort": 9977,
         "port": 30777
       }
-    ]
+    ],
+    "runtime_genesis_config": {
+      "parachainsConfiguration": {
+        "config": {
+          "validation_upgrade_frequency": 1,
+          "validation_upgrade_delay": 1
+        }
+      }
+    }
   },
   "parachains": [
     {
       "bin": "../target/release/basilisk",
-      "id": "200",
-      "wsPort": 9988,
-      "port": 31200,
+      "id": "1001",
+      "chain":"local",
       "balance": "1000000000000000000000",
-      "flags": ["--chain=local", "--", "--execution=wasm"]
+      "nodes": [
+        {
+          "wsPort": 9988,
+          "port": 31200,
+          "flags": ["--alice","--", "--execution=wasm"]
+        },
+        {
+          "wsPort": 9999,
+          "port": 31300,
+          "flags": ["--bob","--", "--execution=wasm"]
+        }
+      ]
     },
     {
-      "bin": "../target/release/basilisk",
-      "id": "300",
-      "wsPort": 9999,
-      "port": 31300,
+      "bin": "../../cumulus/target/release/polkadot-collator",
+      "id": "200",
       "balance": "1000000000000000000000",
-      "flags": ["--chain=local", "--", "--execution=wasm"]
+      "nodes": [
+        {
+          "wsPort": 9980,
+          "port": 31199,
+          "flags": ["--alice","--", "--execution=wasm"]
+        },
+        {
+          "wsPort": 9981,
+          "port": 31299,
+          "flags": ["--bob","--", "--execution=wasm"]
+        }
+      ]
     },
     {
-      "bin": "../target/release/basilisk",
-      "id": "400",
-      "wsPort": 9998,
-      "port": 31400,
+      "bin": "../../statemint/target/release/statemint",
+      "chain": "statemint-dev",
+      "id": "1000",
       "balance": "1000000000000000000000",
-      "flags": ["--chain=local", "--", "--execution=wasm"]
+      "nodes": [
+        {
+          "wsPort": 9970,
+          "port": 31198,
+          "flags": ["--alice", "--force-authoring", "--", "--execution=wasm"]
+        }
+      ]
     }
   ],
+  "hrmpChannels": [],
   "types": {
-    "HrmpChannelId": {
-      "sender": "u32",
-      "receiver": "u32"
-    },
-    "SignedAvailabilityBitfield": {
-      "payload": "BitVec",
-      "validator_index": "u32",
-      "signature": "Signature"
-    },
-    "SignedAvailabilityBitfields": "Vec<SignedAvailabilityBitfield>",
-    "ValidatorSignature": "Signature",
-    "HeadData": "Vec<u8>",
-    "CandidateDescriptor": {
-      "para_id": "u32",
-      "relay_parent": "Hash",
-      "collator_id": "Hash",
-      "persisted_validation_data_hash": "Hash",
-      "pov_hash": "Hash",
-      "signature": "Signature"
-    },
-    "CandidateReceipt": {
-      "descriptor": "CandidateDescriptor",
-      "commitments_hash": "Hash"
-    },
-    "UpwardMessage": "Vec<u8>",
-    "OutboundHrmpMessage": {
-      "recipient": "u32",
-      "data": "Vec<u8>"
-    },
-    "ValidationCode": "Vec<u8>",
-    "CandidateCommitments": {
-      "upward_messages": "Vec<UpwardMessage>",
-      "horizontal_messages": "Vec<OutboundHrmpMessage>",
-      "erasure_root": "Hash",
-      "new_validation_code": "Option<ValidationCode>",
-      "head_data": "HeadData",
-      "processed_downward_messages": "u32",
-      "hrmp_watermark": "BlockNumber"
-    },
-    "CommittedCandidateReceipt": {
-      "descriptor": "CandidateDescriptor",
-      "commitments": "CandidateCommitments"
-    },
-    "ValidityAttestation": {
-      "_enum": {
-        "DummyOffsetBy1": "Raw",
-        "Implicit": "ValidatorSignature",
-        "Explicit": "ValidatorSignature"
-      }
-    },
-    "BackedCandidate": {
-      "candidate": "CommittedCandidateReceipt",
-      "validity_votes": "Vec<ValidityAttestation>",
-      "validator_indices": "BitVec"
-    },
-    "OriginKind": {
-      "_enum": {
-        "Native": null,
-        "SovereignAccount": null,
-        "Superuser": null
-      }
-    },
-    "NetworkId": {
-      "_enum": {
-        "Any": null,
-        "Named": "Vec<u8>",
-        "Polkadot": null,
-        "Kusama": null
-      }
-    },
-    "MultiLocation": {
-      "_enum": {
-        "Null": null,
-        "X1": "Junction",
-        "X2": "(Junction, Junction)",
-        "X3": "(Junction, Junction, Junction)",
-        "X4": "(Junction, Junction, Junction, Junction)"
-      }
-    },
-    "AccountId32Junction": {
-      "network": "NetworkId",
-      "id": "AccountId"
-    },
-    "AccountIndex64Junction": {
-      "network": "NetworkId",
-      "index": "Compact<u64>"
-    },
-    "AccountKey20Junction": {
-      "network": "NetworkId",
-      "index": "[u8; 20]"
-    },
-    "Junction": {
-      "_enum": {
-        "Parent": null,
-        "Parachain": "Compact<u32>",
-        "AccountId32": "AccountId32Junction",
-        "AccountIndex64": "AccountIndex64Junction",
-        "AccountKey20": "AccountKey20Junction",
-        "PalletInstance": "u8",
-        "GeneralIndex": "Compact<u128>",
-        "GeneralKey": "Vec<u8>",
-        "OnlyChild": null
-      }
-    },
-    "VersionedMultiLocation": {
-      "_enum": {
-        "V0": "MultiLocation"
-      }
-    },
-    "AssetInstance": {
-      "_enum": {
-        "Undefined": null,
-        "Index8": "u8",
-        "Index16": "Compact<u16>",
-        "Index32": "Compact<u32>",
-        "Index64": "Compact<u64>",
-        "Index128": "Compact<u128>",
-        "Array4": "[u8; 4]",
-        "Array8": "[u8; 8]",
-        "Array16": "[u8; 16]",
-        "Array32": "[u8; 32]",
-        "Blob": "Vec<u8>"
-      }
-    },
-    "AbstractFungible": {
-      "id": "Vec<u8>",
-      "instance": "Compact<u128>"
-    },
-    "AbstractNonFungible": {
-      "class": "Vec<u8>",
-      "instance": "AssetInstance"
-    },
-    "ConcreteFungible": {
-      "id": "MultiLocation",
-      "amount": "Compact<u128>"
-    },
-    "ConcreteNonFungible": {
-      "class": "MultiLocation",
-      "instance": "AssetInstance"
-    },
-    "MultiAsset": {
-      "_enum": {
-        "None": null,
-        "All": null,
-        "AllFungible": null,
-        "AllNonFungible": null,
-        "AllAbstractFungible": "Vec<u8>",
-        "AllAbstractNonFungible": "Vec<u8>",
-        "AllConcreteFungible": "MultiLocation",
-        "AllConcreteNonFungible": "MultiLocation",
-        "AbstractFungible": "AbstractFungible",
-        "AbstractNonFungible": "AbstractNonFungible",
-        "ConcreteFungible": "ConcreteFungible",
-        "ConcreteNonFungible": "ConcreteNonFungible"
-      }
-    },
-    "VersionedMultiAsset": {
-      "_enum": {
-        "V0": "MultiAsset"
-      }
-    },
-    "DepositAsset": {
-      "assets": "Vec<MultiAsset>",
-      "dest": "MultiLocation"
-    },
-    "DepositReserveAsset": {
-      "assets": "Vec<MultiAsset>",
-      "dest": "MultiLocation",
-      "effects": "Vec<Order>"
-    },
-    "ExchangeAsset": {
-      "give": "Vec<MultiAsset>",
-      "receive": "Vec<MultiAsset>"
-    },
-    "InitiateReserveWithdraw": {
-      "assets": "Vec<MultiAsset>",
-      "reserve": "MultiLocation",
-      "effects": "Vec<Order>"
-    },
-    "InitiateTeleport": {
-      "assets": "Vec<MultiAsset>",
-      "dest": "MultiLocation",
-      "effects": "Vec<Order>"
-    },
-    "QueryHolding": {
-      "query_id": "Compact<u64>",
-      "dest": "MultiLocation",
-      "assets": "Vec<MultiAsset>"
-    },
-    "Order": {
-      "_enum": {
-        "Null": null,
-        "DepositAsset": "DepositAsset",
-        "DepositReserveAsset": "DepositReserveAsset",
-        "ExchangeAsset": "ExchangeAsset",
-        "InitiateReserveWithdraw": "InitiateReserveWithdraw",
-        "InitiateTeleport": "InitiateTeleport",
-        "QueryHolding": "QueryHolding"
-      }
-    },
-    "WithdrawAsset": {
-      "assets": "Vec<MultiAsset>",
-      "effects": "Vec<Order>"
-    },
-    "ReserveAssetDeposit": {
-      "assets": "Vec<MultiAsset>",
-      "effects": "Vec<Order>"
-    },
-    "TeleportAsset": {
-      "assets": "Vec<MultiAsset>",
-      "effects": "Vec<Order>"
-    },
-    "Balances": {
-      "query_id": "Compact<u64>",
-      "assets": "Vec<MultiAsset>"
-    },
-    "Transact": {
-      "origin_type": "OriginKind",
-      "call": "Vec<u8>"
-    },
-    "RelayTo": {
-      "dest": "MultiLocation",
-      "inner": "VersionedXcm"
-    },
-    "RelayedFrom": {
-      "superorigin": "MultiLocation",
-      "inner": "VersionedXcm"
-    },
-    "Xcm": {
-      "_enum": {
-        "WithdrawAsset": "WithdrawAsset",
-        "ReserveAssetDeposit": "ReserveAssetDeposit",
-        "TeleportAsset": "TeleportAsset",
-        "Balances": "Balances",
-        "Transact": "Transact",
-        "RelayTo": "RelayTo",
-        "RelayedFrom": "RelayedFrom"
-      }
-    },
-    "VersionedXcm": {
-      "_enum": {
-        "V0": "Xcm"
-      }
-    },
-    "XcmError": {
-      "_enum": [
-        "Undefined",
-        "Unimplemented",
-        "UnhandledXcmVersion",
-        "UnhandledXcmMessage",
-        "UnhandledEffect",
-        "EscalationOfPrivilege",
-        "UntrustedReserveLocation",
-        "UntrustedTeleportLocation",
-        "DestinationBufferOverflow",
-        "CannotReachDestination",
-        "MultiLocationFull",
-        "FailedToDecode",
-        "BadOrigin"
-      ]
-    },
-    "XcmResult": {
-      "_enum": {
-        "Ok": "()",
-        "Err": "XcmError"
-      }
-    }
+    "Address": "MultiAddress",
+    "LookupSource": "MultiAddress"
   }
 }
diff --git a/rococo-local/config.json b/rococo-local/config.json
index 7cb577fe135..eb9da9de4d2 100644
--- a/rococo-local/config.json
+++ b/rococo-local/config.json
@@ -23,40 +23,37 @@
         "wsPort": 9977,
         "port": 30777
       }
-    ]
+    ],
+    "runtime_genesis_config": {
+      "parachainsConfiguration": {
+        "config": {
+          "validation_upgrade_frequency": 1,
+          "validation_upgrade_delay": 1
+        }
+      }
+    }
   },
   "parachains": [
     {
       "bin": "../target/release/basilisk",
       "id": "200",
-      "wsPort": 9988,
-      "port": 31200,
-      "balance": "1000000000000000000000",
-      "flags": ["--", "--execution=wasm"]
-    },
-    {
-      "bin": "../target/release/basilisk",
-      "id": "300",
-      "wsPort": 9999,
-      "port": 31300,
+      "chain":"local",
       "balance": "1000000000000000000000",
-      "flags": ["--", "--execution=wasm"]
-    }
-  ],
-  "hrmpChannels": [
-    {
-      "sender": "200",
-      "recipient": "300",
-      "maxCapacity": 8,
-      "maxMessageSize": 512
-    },
-    {
-      "sender": "300",
-      "recipient": "200",
-      "maxCapacity": 8,
-      "maxMessageSize": 512
+      "nodes": [
+        {
+          "wsPort": 9988,
+          "port": 31200,
+          "flags": ["--alice","--", "--execution=wasm"]
+        },
+        {
+          "wsPort": 9999,
+          "port": 31300,
+          "flags": ["--bob","--", "--execution=wasm"]
+        }
+      ]
     }
   ],
+  "hrmpChannels": [],
   "types": {
     "Address": "MultiAddress",
     "LookupSource": "MultiAddress"
diff --git a/rococo-local/multiplecollators.json b/rococo-local/multiplecollators.json
deleted file mode 100644
index 33d98b07bc5..00000000000
--- a/rococo-local/multiplecollators.json
+++ /dev/null
@@ -1,323 +0,0 @@
-{
-  "relaychain": {
-    "bin": "../../polkadot/target/release/polkadot",
-    "chain": "rococo-local",
-    "nodes": [
-      {
-        "name": "alice",
-        "wsPort": 9944,
-        "port": 30444
-      },
-      {
-        "name": "bob",
-        "wsPort": 9955,
-        "port": 30555
-      },
-      {
-        "name": "charlie",
-        "wsPort": 9966,
-        "port": 30666
-      },
-      {
-        "name": "dave",
-        "wsPort": 9977,
-        "port": 30777
-      }
-    ]
-  },
-  "parachains": [
-    {
-      "bin": "../target/release/basilisk",
-      "id": "200",
-      "wsPort": 9977,
-      "port": 31100,
-      "balance": "1000000000000000000000",
-      "flags": ["--chain=local", "--", "--execution=wasm"]
-    },
-    {
-      "bin": "../target/release/basilisk",
-      "id": "200",
-      "wsPort": 9999,
-      "port": 31300,
-      "balance": "1000000000000000000000",
-      "flags": ["--chain=local", "--", "--execution=wasm"]
-    },
-    {
-      "bin": "../target/release/basilisk",
-      "id": "200",
-      "wsPort": 9988,
-      "port": 31200,
-      "balance": "1000000000000000000000",
-      "flags": ["--chain=local", "--", "--execution=wasm"]
-    }
-  ],
-  "types": {
-    "HrmpChannelId": {
-      "sender": "u32",
-      "receiver": "u32"
-    },
-    "SignedAvailabilityBitfield": {
-      "payload": "BitVec",
-      "validator_index": "u32",
-      "signature": "Signature"
-    },
-    "SignedAvailabilityBitfields": "Vec<SignedAvailabilityBitfield>",
-    "ValidatorSignature": "Signature",
-    "HeadData": "Vec<u8>",
-    "CandidateDescriptor": {
-      "para_id": "u32",
-      "relay_parent": "Hash",
-      "collator_id": "Hash",
-      "persisted_validation_data_hash": "Hash",
-      "pov_hash": "Hash",
-      "signature": "Signature"
-    },
-    "CandidateReceipt": {
-      "descriptor": "CandidateDescriptor",
-      "commitments_hash": "Hash"
-    },
-    "UpwardMessage": "Vec<u8>",
-    "OutboundHrmpMessage": {
-      "recipient": "u32",
-      "data": "Vec<u8>"
-    },
-    "ValidationCode": "Vec<u8>",
-    "CandidateCommitments": {
-      "upward_messages": "Vec<UpwardMessage>",
-      "horizontal_messages": "Vec<OutboundHrmpMessage>",
-      "erasure_root": "Hash",
-      "new_validation_code": "Option<ValidationCode>",
-      "head_data": "HeadData",
-      "processed_downward_messages": "u32",
-      "hrmp_watermark": "BlockNumber"
-    },
-    "CommittedCandidateReceipt": {
-      "descriptor": "CandidateDescriptor",
-      "commitments": "CandidateCommitments"
-    },
-    "ValidityAttestation": {
-      "_enum": {
-        "DummyOffsetBy1": "Raw",
-        "Implicit": "ValidatorSignature",
-        "Explicit": "ValidatorSignature"
-      }
-    },
-    "BackedCandidate": {
-      "candidate": "CommittedCandidateReceipt",
-      "validity_votes": "Vec<ValidityAttestation>",
-      "validator_indices": "BitVec"
-    },
-    "OriginKind": {
-      "_enum": {
-        "Native": null,
-        "SovereignAccount": null,
-        "Superuser": null
-      }
-    },
-    "NetworkId": {
-      "_enum": {
-        "Any": null,
-        "Named": "Vec<u8>",
-        "Polkadot": null,
-        "Kusama": null
-      }
-    },
-    "MultiLocation": {
-      "_enum": {
-        "Null": null,
-        "X1": "Junction",
-        "X2": "(Junction, Junction)",
-        "X3": "(Junction, Junction, Junction)",
-        "X4": "(Junction, Junction, Junction, Junction)"
-      }
-    },
-    "AccountId32Junction": {
-      "network": "NetworkId",
-      "id": "AccountId"
-    },
-    "AccountIndex64Junction": {
-      "network": "NetworkId",
-      "index": "Compact<u64>"
-    },
-    "AccountKey20Junction": {
-      "network": "NetworkId",
-      "index": "[u8; 20]"
-    },
-    "Junction": {
-      "_enum": {
-        "Parent": null,
-        "Parachain": "Compact<u32>",
-        "AccountId32": "AccountId32Junction",
-        "AccountIndex64": "AccountIndex64Junction",
-        "AccountKey20": "AccountKey20Junction",
-        "PalletInstance": "u8",
-        "GeneralIndex": "Compact<u128>",
-        "GeneralKey": "Vec<u8>",
-        "OnlyChild": null
-      }
-    },
-    "VersionedMultiLocation": {
-      "_enum": {
-        "V0": "MultiLocation"
-      }
-    },
-    "AssetInstance": {
-      "_enum": {
-        "Undefined": null,
-        "Index8": "u8",
-        "Index16": "Compact<u16>",
-        "Index32": "Compact<u32>",
-        "Index64": "Compact<u64>",
-        "Index128": "Compact<u128>",
-        "Array4": "[u8; 4]",
-        "Array8": "[u8; 8]",
-        "Array16": "[u8; 16]",
-        "Array32": "[u8; 32]",
-        "Blob": "Vec<u8>"
-      }
-    },
-    "AbstractFungible": {
-      "id": "Vec<u8>",
-      "instance": "Compact<u128>"
-    },
-    "AbstractNonFungible": {
-      "class": "Vec<u8>",
-      "instance": "AssetInstance"
-    },
-    "ConcreteFungible": {
-      "id": "MultiLocation",
-      "amount": "Compact<u128>"
-    },
-    "ConcreteNonFungible": {
-      "class": "MultiLocation",
-      "instance": "AssetInstance"
-    },
-    "MultiAsset": {
-      "_enum": {
-        "None": null,
-        "All": null,
-        "AllFungible": null,
-        "AllNonFungible": null,
-        "AllAbstractFungible": "Vec<u8>",
-        "AllAbstractNonFungible": "Vec<u8>",
-        "AllConcreteFungible": "MultiLocation",
-        "AllConcreteNonFungible": "MultiLocation",
-        "AbstractFungible": "AbstractFungible",
-        "AbstractNonFungible": "AbstractNonFungible",
-        "ConcreteFungible": "ConcreteFungible",
-        "ConcreteNonFungible": "ConcreteNonFungible"
-      }
-    },
-    "VersionedMultiAsset": {
-      "_enum": {
-        "V0": "MultiAsset"
-      }
-    },
-    "DepositAsset": {
-      "assets": "Vec<MultiAsset>",
-      "dest": "MultiLocation"
-    },
-    "DepositReserveAsset": {
-      "assets": "Vec<MultiAsset>",
-      "dest": "MultiLocation",
-      "effects": "Vec<Order>"
-    },
-    "ExchangeAsset": {
-      "give": "Vec<MultiAsset>",
-      "receive": "Vec<MultiAsset>"
-    },
-    "InitiateReserveWithdraw": {
-      "assets": "Vec<MultiAsset>",
-      "reserve": "MultiLocation",
-      "effects": "Vec<Order>"
-    },
-    "InitiateTeleport": {
-      "assets": "Vec<MultiAsset>",
-      "dest": "MultiLocation",
-      "effects": "Vec<Order>"
-    },
-    "QueryHolding": {
-      "query_id": "Compact<u64>",
-      "dest": "MultiLocation",
-      "assets": "Vec<MultiAsset>"
-    },
-    "Order": {
-      "_enum": {
-        "Null": null,
-        "DepositAsset": "DepositAsset",
-        "DepositReserveAsset": "DepositReserveAsset",
-        "ExchangeAsset": "ExchangeAsset",
-        "InitiateReserveWithdraw": "InitiateReserveWithdraw",
-        "InitiateTeleport": "InitiateTeleport",
-        "QueryHolding": "QueryHolding"
-      }
-    },
-    "WithdrawAsset": {
-      "assets": "Vec<MultiAsset>",
-      "effects": "Vec<Order>"
-    },
-    "ReserveAssetDeposit": {
-      "assets": "Vec<MultiAsset>",
-      "effects": "Vec<Order>"
-    },
-    "TeleportAsset": {
-      "assets": "Vec<MultiAsset>",
-      "effects": "Vec<Order>"
-    },
-    "Balances": {
-      "query_id": "Compact<u64>",
-      "assets": "Vec<MultiAsset>"
-    },
-    "Transact": {
-      "origin_type": "OriginKind",
-      "call": "Vec<u8>"
-    },
-    "RelayTo": {
-      "dest": "MultiLocation",
-      "inner": "VersionedXcm"
-    },
-    "RelayedFrom": {
-      "superorigin": "MultiLocation",
-      "inner": "VersionedXcm"
-    },
-    "Xcm": {
-      "_enum": {
-        "WithdrawAsset": "WithdrawAsset",
-        "ReserveAssetDeposit": "ReserveAssetDeposit",
-        "TeleportAsset": "TeleportAsset",
-        "Balances": "Balances",
-        "Transact": "Transact",
-        "RelayTo": "RelayTo",
-        "RelayedFrom": "RelayedFrom"
-      }
-    },
-    "VersionedXcm": {
-      "_enum": {
-        "V0": "Xcm"
-      }
-    },
-    "XcmError": {
-      "_enum": [
-        "Undefined",
-        "Unimplemented",
-        "UnhandledXcmVersion",
-        "UnhandledXcmMessage",
-        "UnhandledEffect",
-        "EscalationOfPrivilege",
-        "UntrustedReserveLocation",
-        "UntrustedTeleportLocation",
-        "DestinationBufferOverflow",
-        "CannotReachDestination",
-        "MultiLocationFull",
-        "FailedToDecode",
-        "BadOrigin"
-      ]
-    },
-    "XcmResult": {
-      "_enum": {
-        "Ok": "()",
-        "Err": "XcmError"
-      }
-    }
-  }
-}
diff --git a/rococo-local/withtick.json b/rococo-local/withtick.json
deleted file mode 100644
index bc744bc4bce..00000000000
--- a/rococo-local/withtick.json
+++ /dev/null
@@ -1,325 +0,0 @@
-{
-  "relaychain": {
-    "bin": "../../polkadot/target/release/polkadot",
-    "chain": "rococo-local",
-    "nodes": [
-      {
-        "name": "alice",
-        "wsPort": 9944,
-        "port": 30444
-      },
-      {
-        "name": "bob",
-        "wsPort": 9955,
-        "port": 30555
-      },
-      {
-        "name": "charlie",
-        "wsPort": 9966,
-        "port": 30666
-      },
-      {
-        "name": "dave",
-        "wsPort": 9977,
-        "port": 30777
-      },
-      {
-        "name": "eve",
-        "wsPort": 9978,
-        "port": 30778
-      },
-      {
-        "name": "ferdie",
-        "wsPort": 9979,
-        "port": 30779
-      }
-    ]
-  },
-  "parachains": [
-    {
-      "bin": "../../cumulus/target/release/rococo-collator",
-      "id": "100",
-      "wsPort": 9977,
-      "port": 31100,
-      "balance": "1000000000000000000000",
-      "flags": ["--chain=local", "--", "--execution=wasm"]
-    },
-    {
-      "bin": "../target/release/basilisk",
-      "id": "200",
-      "wsPort": 9988,
-      "port": 31200,
-      "balance": "1000000000000000000000",
-      "flags": ["--chain=local", "--", "--execution=wasm"]
-    }
-  ],
-  "types": {
-    "HrmpChannelId": {
-      "sender": "u32",
-      "receiver": "u32"
-    },
-    "SignedAvailabilityBitfield": {
-      "payload": "BitVec",
-      "validator_index": "u32",
-      "signature": "Signature"
-    },
-    "SignedAvailabilityBitfields": "Vec<SignedAvailabilityBitfield>",
-    "ValidatorSignature": "Signature",
-    "HeadData": "Vec<u8>",
-    "CandidateDescriptor": {
-      "para_id": "u32",
-      "relay_parent": "Hash",
-      "collator_id": "Hash",
-      "persisted_validation_data_hash": "Hash",
-      "pov_hash": "Hash",
-      "signature": "Signature"
-    },
-    "CandidateReceipt": {
-      "descriptor": "CandidateDescriptor",
-      "commitments_hash": "Hash"
-    },
-    "UpwardMessage": "Vec<u8>",
-    "OutboundHrmpMessage": {
-      "recipient": "u32",
-      "data": "Vec<u8>"
-    },
-    "ValidationCode": "Vec<u8>",
-    "CandidateCommitments": {
-      "upward_messages": "Vec<UpwardMessage>",
-      "horizontal_messages": "Vec<OutboundHrmpMessage>",
-      "erasure_root": "Hash",
-      "new_validation_code": "Option<ValidationCode>",
-      "head_data": "HeadData",
-      "processed_downward_messages": "u32",
-      "hrmp_watermark": "BlockNumber"
-    },
-    "CommittedCandidateReceipt": {
-      "descriptor": "CandidateDescriptor",
-      "commitments": "CandidateCommitments"
-    },
-    "ValidityAttestation": {
-      "_enum": {
-        "DummyOffsetBy1": "Raw",
-        "Implicit": "ValidatorSignature",
-        "Explicit": "ValidatorSignature"
-      }
-    },
-    "BackedCandidate": {
-      "candidate": "CommittedCandidateReceipt",
-      "validity_votes": "Vec<ValidityAttestation>",
-      "validator_indices": "BitVec"
-    },
-    "OriginKind": {
-      "_enum": {
-        "Native": null,
-        "SovereignAccount": null,
-        "Superuser": null
-      }
-    },
-    "NetworkId": {
-      "_enum": {
-        "Any": null,
-        "Named": "Vec<u8>",
-        "Polkadot": null,
-        "Kusama": null
-      }
-    },
-    "MultiLocation": {
-      "_enum": {
-        "Null": null,
-        "X1": "Junction",
-        "X2": "(Junction, Junction)",
-        "X3": "(Junction, Junction, Junction)",
-        "X4": "(Junction, Junction, Junction, Junction)"
-      }
-    },
-    "AccountId32Junction": {
-      "network": "NetworkId",
-      "id": "AccountId"
-    },
-    "AccountIndex64Junction": {
-      "network": "NetworkId",
-      "index": "Compact<u64>"
-    },
-    "AccountKey20Junction": {
-      "network": "NetworkId",
-      "index": "[u8; 20]"
-    },
-    "Junction": {
-      "_enum": {
-        "Parent": null,
-        "Parachain": "Compact<u32>",
-        "AccountId32": "AccountId32Junction",
-        "AccountIndex64": "AccountIndex64Junction",
-        "AccountKey20": "AccountKey20Junction",
-        "PalletInstance": "u8",
-        "GeneralIndex": "Compact<u128>",
-        "GeneralKey": "Vec<u8>",
-        "OnlyChild": null
-      }
-    },
-    "VersionedMultiLocation": {
-      "_enum": {
-        "V0": "MultiLocation"
-      }
-    },
-    "AssetInstance": {
-      "_enum": {
-        "Undefined": null,
-        "Index8": "u8",
-        "Index16": "Compact<u16>",
-        "Index32": "Compact<u32>",
-        "Index64": "Compact<u64>",
-        "Index128": "Compact<u128>",
-        "Array4": "[u8; 4]",
-        "Array8": "[u8; 8]",
-        "Array16": "[u8; 16]",
-        "Array32": "[u8; 32]",
-        "Blob": "Vec<u8>"
-      }
-    },
-    "AbstractFungible": {
-      "id": "Vec<u8>",
-      "instance": "Compact<u128>"
-    },
-    "AbstractNonFungible": {
-      "class": "Vec<u8>",
-      "instance": "AssetInstance"
-    },
-    "ConcreteFungible": {
-      "id": "MultiLocation",
-      "amount": "Compact<u128>"
-    },
-    "ConcreteNonFungible": {
-      "class": "MultiLocation",
-      "instance": "AssetInstance"
-    },
-    "MultiAsset": {
-      "_enum": {
-        "None": null,
-        "All": null,
-        "AllFungible": null,
-        "AllNonFungible": null,
-        "AllAbstractFungible": "Vec<u8>",
-        "AllAbstractNonFungible": "Vec<u8>",
-        "AllConcreteFungible": "MultiLocation",
-        "AllConcreteNonFungible": "MultiLocation",
-        "AbstractFungible": "AbstractFungible",
-        "AbstractNonFungible": "AbstractNonFungible",
-        "ConcreteFungible": "ConcreteFungible",
-        "ConcreteNonFungible": "ConcreteNonFungible"
-      }
-    },
-    "VersionedMultiAsset": {
-      "_enum": {
-        "V0": "MultiAsset"
-      }
-    },
-    "DepositAsset": {
-      "assets": "Vec<MultiAsset>",
-      "dest": "MultiLocation"
-    },
-    "DepositReserveAsset": {
-      "assets": "Vec<MultiAsset>",
-      "dest": "MultiLocation",
-      "effects": "Vec<Order>"
-    },
-    "ExchangeAsset": {
-      "give": "Vec<MultiAsset>",
-      "receive": "Vec<MultiAsset>"
-    },
-    "InitiateReserveWithdraw": {
-      "assets": "Vec<MultiAsset>",
-      "reserve": "MultiLocation",
-      "effects": "Vec<Order>"
-    },
-    "InitiateTeleport": {
-      "assets": "Vec<MultiAsset>",
-      "dest": "MultiLocation",
-      "effects": "Vec<Order>"
-    },
-    "QueryHolding": {
-      "query_id": "Compact<u64>",
-      "dest": "MultiLocation",
-      "assets": "Vec<MultiAsset>"
-    },
-    "Order": {
-      "_enum": {
-        "Null": null,
-        "DepositAsset": "DepositAsset",
-        "DepositReserveAsset": "DepositReserveAsset",
-        "ExchangeAsset": "ExchangeAsset",
-        "InitiateReserveWithdraw": "InitiateReserveWithdraw",
-        "InitiateTeleport": "InitiateTeleport",
-        "QueryHolding": "QueryHolding"
-      }
-    },
-    "WithdrawAsset": {
-      "assets": "Vec<MultiAsset>",
-      "effects": "Vec<Order>"
-    },
-    "ReserveAssetDeposit": {
-      "assets": "Vec<MultiAsset>",
-      "effects": "Vec<Order>"
-    },
-    "TeleportAsset": {
-      "assets": "Vec<MultiAsset>",
-      "effects": "Vec<Order>"
-    },
-    "Balances": {
-      "query_id": "Compact<u64>",
-      "assets": "Vec<MultiAsset>"
-    },
-    "Transact": {
-      "origin_type": "OriginKind",
-      "call": "Vec<u8>"
-    },
-    "RelayTo": {
-      "dest": "MultiLocation",
-      "inner": "VersionedXcm"
-    },
-    "RelayedFrom": {
-      "superorigin": "MultiLocation",
-      "inner": "VersionedXcm"
-    },
-    "Xcm": {
-      "_enum": {
-        "WithdrawAsset": "WithdrawAsset",
-        "ReserveAssetDeposit": "ReserveAssetDeposit",
-        "TeleportAsset": "TeleportAsset",
-        "Balances": "Balances",
-        "Transact": "Transact",
-        "RelayTo": "RelayTo",
-        "RelayedFrom": "RelayedFrom"
-      }
-    },
-    "VersionedXcm": {
-      "_enum": {
-        "V0": "Xcm"
-      }
-    },
-    "XcmError": {
-      "_enum": [
-        "Undefined",
-        "Unimplemented",
-        "UnhandledXcmVersion",
-        "UnhandledXcmMessage",
-        "UnhandledEffect",
-        "EscalationOfPrivilege",
-        "UntrustedReserveLocation",
-        "UntrustedTeleportLocation",
-        "DestinationBufferOverflow",
-        "CannotReachDestination",
-        "MultiLocationFull",
-        "FailedToDecode",
-        "BadOrigin"
-      ]
-    },
-    "XcmResult": {
-      "_enum": {
-        "Ok": "()",
-        "Err": "XcmError"
-      }
-    }
-  }
-}
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index 54c278e3e9b..9ebe398c147 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -25,35 +25,36 @@ trie-db = { version = "0.22.0", default-features = false }
 
 # local dependencies
 pallet-asset-registry = { default-features = false, version = '3.0.0' }
-pallet-amm = { default-features = false, version = '4.0.1' }
+pallet-xyk= { default-features = false, version = '1.0.0' }
 pallet-exchange = { default-features = false, version = '3.0.0' }
 pallet-exchange-benchmarking = { default-features = false, optional = true, version = '3.0.0' }
 pallet-faucet = { default-features = false, version = '3.0.0' }
-pallet-transaction-multi-payment = { path = '../pallets/transaction-multi-payment', default-features = false, version = '3.0.0' }
-pallet-multi-payment-benchmarking = { path = '../pallets/transaction-multi-payment/benchmarking', default-features = false, optional = true, version = '3.0.0' }
+pallet-transaction-multi-payment = { default-features = false, version = '3.0.0' }
+pallet-multi-payment-benchmarking = { default-features = false, optional = true, version = '3.0.0' }
 primitives = { default-features = false, version = '3.0.0' }
-module-amm-rpc-runtime-api = { default-features = false, version = '3.0.0' }
+pallet-xyk-rpc-runtime-api = { default-features = false, version = '3.0.0' }
 
 # ORML dependencies
 orml-currencies = { default-features = false, version = "0.4.1-dev" }
 orml-tokens = { default-features = false, version = "0.4.1-dev" }
-orml-unknown-tokens = { default-features = false, version = "0.4.1-dev" }
+#orml-unknown-tokens = { default-features = false, version = "0.4.1-dev" }
 orml-traits = { default-features = false, version = "0.4.1-dev" }
-orml-xtokens = { default-features = false, version = "0.4.1-dev" }
-orml-xcm-support = { default-features = false, version = "0.4.1-dev" }
+#orml-xtokens = { default-features = false, version = "0.4.1-dev" }
+#orml-xcm-support = { default-features = false, version = "0.4.1-dev" }
 
 # Cumulus dependencies
-cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus',  default-features = false, branch = "rococo-v1" }
-cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus',  default-features = false, branch = "rococo-v1" }
-cumulus-primitives-parachain-inherent = { git = 'https://github.com/paritytech/cumulus',  default-features = false, branch = "rococo-v1" }
-cumulus-pallet-xcm-handler = { git = 'https://github.com/paritytech/cumulus',  default-features = false, branch = "rococo-v1" }
-parachain-info = { git = 'https://github.com/paritytech/cumulus',  default-features = false, branch = "rococo-v1" }
+cumulus-pallet-aura-ext = { git = 'https://github.com/paritytech/cumulus',  default-features = false, branch = "polkadot-v0.9.1" }
+cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus',  default-features = false, branch = "polkadot-v0.9.1" }
+cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus',  default-features = false, branch = "polkadot-v0.9.1" }
+cumulus-primitives-parachain-inherent = { git = 'https://github.com/paritytech/cumulus',  default-features = false, branch = "polkadot-v0.9.1" }
+#cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus',  default-features = false, branch = "polkadot-v0.9.1" }
+parachain-info = { git = 'https://github.com/paritytech/cumulus',  default-features = false, branch = "polkadot-v0.9.1" }
 
 # Polkadot dependencies
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, features = ["wasm-api"], branch = "rococo-v1" }
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "rococo-v1" }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "rococo-v1" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "rococo-v1" }
+polkadot-parachain = { version = "0.9.1", default-features = false, features = ["wasm-api"]}
+#xcm = { default-features = false }
+#xcm-builder = { default-features = false }
+#xcm-executor = { default-features = false }
 
 # Substrate dependencies
 frame-benchmarking = { default-features = false, optional = true, version = '3.0.0' }
@@ -101,7 +102,7 @@ runtime-benchmarks = [
     'pallet-society/runtime-benchmarks',
     'pallet-timestamp/runtime-benchmarks',
     'pallet-multi-payment-benchmarking',
-    "pallet-amm/runtime-benchmarks",
+    "pallet-xyk/runtime-benchmarks",
     "pallet-exchange-benchmarking",
     'sp-runtime/runtime-benchmarks',
 ]
@@ -115,17 +116,18 @@ std = [
     'orml-currencies/std',
     'orml-tokens/std',
     'orml-traits/std',
-    "orml-xtokens/std",
-    "orml-xcm-support/std",
+    #"orml-xtokens/std",
+    #"orml-xcm-support/std",
     "cumulus-pallet-parachain-system/std",
-    "cumulus-pallet-xcm-handler/std",
+    "cumulus-pallet-aura-ext/std",
+    #"cumulus-pallet-xcm/std",
     "cumulus-primitives-core/std",
     "cumulus-primitives-parachain-inherent/std",
-    "xcm/std",
-    "xcm-builder/std",
-    "xcm-executor/std",
+    #"xcm/std",
+    #"xcm-builder/std",
+    #"xcm-executor/std",
     'parachain-info/std',
-    'pallet-amm/std',
+    'pallet-xyk/std',
     'pallet-asset-registry/std',
     'pallet-exchange/std',
     'pallet-faucet/std',
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index 5d4e804c622..e712c782224 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -9,25 +9,20 @@
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
 use sp_api::impl_runtime_apis;
-use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
+use sp_core::OpaqueMetadata;
 use sp_runtime::traits::{BlakeTwo256, Block as BlockT, IdentifyAccount, IdentityLookup, Verify};
 use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
-	traits::Convert,
 	traits::Zero,
 	transaction_validity::{TransactionSource, TransactionValidity},
-	ApplyExtrinsicResult, DispatchResult, MultiSignature,
+	ApplyExtrinsicResult, MultiSignature,
 };
-use sp_std::convert::{From, TryFrom};
+use sp_std::convert::From;
 use sp_std::prelude::*;
 #[cfg(feature = "std")]
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
 
-use sp_std::collections::btree_set::BTreeSet;
-
-use frame_system::{limits, EnsureRoot};
-
 // A few exports that help ease life for downstream crates.
 pub use frame_support::{
 	construct_runtime, parameter_types,
@@ -40,6 +35,7 @@ pub use frame_support::{
 };
 pub use pallet_balances::Call as BalancesCall;
 pub use pallet_timestamp::Call as TimestampCall;
+pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
 pub use sp_runtime::{Perbill, Permill};
@@ -48,35 +44,16 @@ use primitives::fee;
 
 mod currency;
 
-use currency::CurrencyId;
-
-use cumulus_pallet_xcm_handler as xcm_handler;
-
-use module_amm_rpc_runtime_api as amm_rpc;
+use pallet_xyk_rpc_runtime_api as xyk_rpc;
 
 use orml_currencies::BasicCurrencyAdapter;
 use orml_traits::parameter_type_with_key;
-use orml_xcm_support::{
-	CurrencyIdConversion, IsConcreteWithGeneralKey, MultiCurrencyAdapter as XCMMultiCurrencyAdapter,
-	NativePalletAssetOr, XcmHandler as XcmHandlerT,
-};
 
-use cumulus_primitives_core::relay_chain::Balance as RelayChainBalance;
 pub use primitives::{Amount, AssetId, Balance, Moment, CORE_ASSET_ID};
 
-// XCM imports
-use polkadot_parachain::primitives::Sibling;
-use xcm::v0::{Junction, MultiAsset, MultiLocation, NetworkId, Xcm};
-use xcm_builder::{
-	AccountId32Aliases, ChildParachainConvertsVia, LocationInverter, ParentIsDefault, RelayChainAsNative,
-	SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SovereignSignedViaLocation,
-};
-use xcm_executor::{Config, XcmExecutor};
-
 pub use pallet_asset_registry;
 pub use pallet_faucet;
 
-use cumulus_primitives_core::ParaId;
 use pallet_transaction_multi_payment::{weights::WeightInfo, MultiCurrencyAdapter};
 
 /// An index to a block.
@@ -117,9 +94,11 @@ pub mod opaque {
 	pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 	/// Opaque block identifier type.
 	pub type BlockId = generic::BlockId<Block>;
+}
 
-	impl_opaque_keys! {
-		pub struct SessionKeys {}
+impl_opaque_keys! {
+	pub struct SessionKeys {
+		pub aura: Aura,
 	}
 }
 
@@ -133,15 +112,21 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	transaction_version: 1,
 };
 
+//TODO is 6s safe?
 pub const MILLISECS_PER_BLOCK: u64 = 6000;
 
 pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;
 
+pub const EPOCH_DURATION_IN_BLOCKS: u32 = 10 * MINUTES;
+
 // Time is measured by number of blocks.
 pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);
 pub const HOURS: BlockNumber = MINUTES * 60;
 pub const DAYS: BlockNumber = HOURS * 24;
 
+// 1 in 4 blocks (on average, not counting collisions) will be primary babe blocks.
+pub const PRIMARY_PROBABILITY: (u64, u64) = (1, 4);
+
 /// We assume that an on-initialize consumes 2.5% of the weight on average, hence a single extrinsic
 /// will not be allowed to consume more than `AvailableBlockRatio - 2.5%`.
 pub const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_perthousand(25);
@@ -161,13 +146,13 @@ pub fn native_version() -> NativeVersion {
 }
 
 parameter_types! {
-	pub const BlockHashCount: BlockNumber = 2400;
+	pub const BlockHashCount: BlockNumber = 250;
 	pub const Version: RuntimeVersion = VERSION;
 	/// Maximum length of block. Up to 5MB.
-	pub BlockLength: limits::BlockLength =
-		limits::BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);
+	pub BlockLength: frame_system::limits::BlockLength =
+		frame_system::limits::BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);
 	/// Block weights base values and limits.
-	pub BlockWeights: limits::BlockWeights = limits::BlockWeights::builder()
+	pub BlockWeights: frame_system::limits::BlockWeights = frame_system::limits::BlockWeights::builder()
 		.base_block(BlockExecutionWeight::get())
 		.for_class(DispatchClass::all(), |weights| {
 			weights.base_extrinsic = ExtrinsicBaseWeight::get();
@@ -238,7 +223,7 @@ impl frame_system::Config for Runtime {
 	/// Weight information for the extrinsics of this pallet.
 	type SystemWeightInfo = ();
 	type SS58Prefix = SS58Prefix;
-	type OnSetCode = ParachainSystem;
+	type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;
 }
 
 parameter_types! {
@@ -287,7 +272,7 @@ impl pallet_transaction_multi_payment::Config for Runtime {
 	type Event = Event;
 	type Currency = Balances;
 	type MultiCurrency = Currencies;
-	type AMMPool = AMM;
+	type AMMPool = XYK;
 	type WeightInfo = pallet_transaction_multi_payment::weights::HydraWeight<Runtime>;
 	type WithdrawFeeForSetCurrency = MultiPaymentCurrencySetFee;
 	type WeightToFee = IdentityFee<Balance>;
@@ -313,6 +298,7 @@ impl orml_tokens::Config for Runtime {
 	type WeightInfo = ();
 	type ExistentialDeposits = ExistentialDeposits;
 	type OnDust = ();
+	type MaxLocks = MaxLocks;
 }
 
 impl orml_currencies::Config for Runtime {
@@ -333,18 +319,18 @@ parameter_types! {
 	pub ExchangeFee: fee::Fee = fee::Fee::default();
 }
 
-impl pallet_amm::Config for Runtime {
+impl pallet_xyk::Config for Runtime {
 	type Event = Event;
-	type AssetPairAccountId = pallet_amm::AssetPairAccountId<Self>;
+	type AssetPairAccountId = pallet_xyk::AssetPairAccountId<Self>;
 	type Currency = Currencies;
-	type HDXAssetId = NativeAssetId;
-	type WeightInfo = pallet_amm::weights::HydraWeight<Runtime>;
+	type NativeAssetId = NativeAssetId;
+	type WeightInfo = pallet_xyk::weights::HydraWeight<Runtime>;
 	type GetExchangeFee = ExchangeFee;
 }
 
 impl pallet_exchange::Config for Runtime {
 	type Event = Event;
-	type AMMPool = AMM;
+	type AMMPool = XYK;
 	type Resolver = Exchange;
 	type Currency = Currencies;
 	type WeightInfo = pallet_exchange::weights::HydraWeight<Runtime>;
@@ -361,144 +347,20 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type Event = Event;
 	type OnValidationData = ();
 	type SelfParaId = ParachainInfo;
-	type DownwardMessageHandlers = XcmHandler;
-	type XcmpMessageHandlers = XcmHandler;
-}
-
-impl parachain_info::Config for Runtime {}
-
-parameter_types! {
-	pub const PolkadotNetworkId: NetworkId = NetworkId::Polkadot;
-
-	pub BasiliskNetwork: NetworkId = NetworkId::Named("basilisk".into());
-	pub RelayChainOrigin: Origin = xcm_handler::Origin::Relay.into();
-
-	pub Ancestry: MultiLocation = MultiLocation::X1(Junction::Parachain {
-		id: ParachainInfo::parachain_id().into(),
-	});
-
-	pub const RelayChainCurrencyId: CurrencyId = CurrencyId::DOT;
-
+	type OutboundXcmpMessageSource = ();
+	type DmpMessageHandler = ();
+	type ReservedDmpWeight = ();
+	type XcmpMessageHandler = ();
+	type ReservedXcmpWeight = ();
 }
 
-type LocationConverter = (
-	ParentIsDefault<AccountId>,
-	ChildParachainConvertsVia<ParaId, AccountId>,
-	SiblingParachainConvertsVia<Sibling, AccountId>,
-	AccountId32Aliases<BasiliskNetwork, AccountId>,
-);
-
-pub struct AssetCurrencyConverter;
-
-impl CurrencyIdConversion<AssetId> for AssetCurrencyConverter {
-	fn from_asset(asset: &MultiAsset) -> Option<AssetId> {
-		if let MultiAsset::ConcreteFungible { id: location, .. } = asset {
-			if location == &MultiLocation::X1(Junction::Parent) {
-				return Some(CurrencyId::DOT as u32);
-			}
-			if let Some(Junction::GeneralKey(key)) = location.last() {
-				let r = match CurrencyId::try_from(key.clone()).ok() {
-					Some(val) => Some(val as u32),
-					None => None,
-				};
-
-				return r;
-			}
-		}
-		None
-	}
-}
-
-pub type LocalAssetTransactor = XCMMultiCurrencyAdapter<
-	Currencies,
-	UnknownTokens,
-	IsConcreteWithGeneralKey<CurrencyId, RelayToNative>,
-	LocationConverter,
-	AccountId,
-	AssetCurrencyConverter,
-	AssetId,
->;
-
-type LocalOriginConverter = (
-	SovereignSignedViaLocation<LocationConverter, Origin>,
-	RelayChainAsNative<RelayChainOrigin, Origin>,
-	SiblingParachainAsNative<xcm_handler::Origin, Origin>,
-	SignedAccountId32AsNative<BasiliskNetwork, Origin>,
-);
-
-parameter_types! {
-	pub NativeTokens: BTreeSet<(Vec<u8>, MultiLocation)> = {
-		let mut t = BTreeSet::new();
-		t.insert(("AUSD".into(), (Junction::Parent, Junction::Parachain { id: 666 }).into()));
-		t.insert(("ACA".into(), (Junction::Parent, Junction::Parachain { id: 666 }).into()));
-		t
-	};
-}
-
-pub struct XcmConfig;
-impl Config for XcmConfig {
-	type Call = Call;
-	type XcmSender = XcmHandler;
-	// How to withdraw and deposit an asset.
-	type AssetTransactor = LocalAssetTransactor;
-	type OriginConverter = LocalOriginConverter;
-	type IsReserve = NativePalletAssetOr<NativeTokens>;
-	type IsTeleporter = ();
-	type LocationInverter = LocationInverter<Ancestry>;
+impl pallet_aura::Config for Runtime {
+	type AuthorityId = AuraId;
 }
 
-impl cumulus_pallet_xcm_handler::Config for Runtime {
-	type Event = Event;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type UpwardMessageSender = ParachainSystem;
-	type XcmpMessageSender = ParachainSystem;
-	type SendXcmOrigin = EnsureRoot<AccountId>;
-	type AccountIdConverter = LocationConverter;
-}
-
-/// Xtokens config
-
-pub struct RelayToNative;
-impl Convert<RelayChainBalance, Balance> for RelayToNative {
-	fn convert(val: u128) -> Balance {
-		val
-	}
-}
-
-pub struct NativeToRelay;
-impl Convert<Balance, RelayChainBalance> for NativeToRelay {
-	fn convert(val: u128) -> Balance {
-		val
-	}
-}
-
-pub struct AccountId32Convert;
-impl Convert<AccountId, [u8; 32]> for AccountId32Convert {
-	fn convert(account_id: AccountId) -> [u8; 32] {
-		account_id.into()
-	}
-}
-
-pub struct HandleXcm;
-impl XcmHandlerT<AccountId> for HandleXcm {
-	fn execute_xcm(origin: AccountId, xcm: Xcm) -> DispatchResult {
-		XcmHandler::execute_xcm(origin, xcm)
-	}
-}
-
-impl orml_xtokens::Config for Runtime {
-	type Event = Event;
-	type Balance = Balance;
-	type ToRelayChainBalance = NativeToRelay;
-	type AccountId32Convert = AccountId32Convert;
-	type RelayChainNetworkId = PolkadotNetworkId;
-	type ParaId = ParachainInfo;
-	type XcmHandler = HandleXcm;
-}
+impl parachain_info::Config for Runtime {}
 
-impl orml_unknown_tokens::Config for Runtime {
-	type Event = Event;
-}
+impl cumulus_pallet_aura_ext::Config for Runtime {}
 
 // Create the runtime by composing the FRAME pallets that were previously configured.
 construct_runtime!(
@@ -515,19 +377,18 @@ construct_runtime!(
 		Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>},
 
 		// Parachain
-		ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event},
+		ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event<T>, ValidateUnsigned},
 		ParachainInfo: parachain_info::{Pallet, Storage, Config},
-		XcmHandler: xcm_handler::{Pallet, Call, Event<T>, Origin},
-		XTokens: orml_xtokens::{Pallet, Storage, Call, Event<T>},
+		Aura: pallet_aura::{Pallet, Config<T>},
+		AuraExt: cumulus_pallet_aura_ext::{Pallet, Config},
 
 		// ORML related modules
 		Tokens: orml_tokens::{Pallet, Storage, Call, Event<T>, Config<T>},
 		Currencies: orml_currencies::{Pallet, Call, Event<T>},
-		UnknownTokens: orml_unknown_tokens::{Pallet, Storage, Event},
 
 		// Basilisk related modules
 		AssetRegistry: pallet_asset_registry::{Pallet, Call, Storage, Config<T>},
-		AMM: pallet_amm::{Pallet, Call, Storage, Event<T>},
+		XYK: pallet_xyk::{Pallet, Call, Storage, Event<T>},
 		Exchange: pallet_exchange::{Pallet, Call, Storage, Event<T>},
 		Faucet: pallet_faucet::{Pallet, Call, Storage, Config, Event<T>},
 		MultiTransactionPayment: pallet_transaction_multi_payment::{Pallet, Call, Storage, Event<T>},
@@ -602,10 +463,6 @@ impl_runtime_apis! {
 		) -> sp_inherents::CheckInherentsResult {
 			data.check_extrinsics(&block)
 		}
-
-		fn random_seed() -> <Block as BlockT>::Hash {
-			RandomnessCollectiveFlip::random_seed().0
-		}
 	}
 
 	impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {
@@ -624,14 +481,30 @@ impl_runtime_apis! {
 	}
 
 	impl sp_session::SessionKeys<Block> for Runtime {
+		fn decode_session_keys(
+			encoded: Vec<u8>,
+		) -> Option<Vec<(Vec<u8>, sp_core::crypto::KeyTypeId)>> {
+			SessionKeys::decode_into_raw_public_keys(&encoded)
+		}
+
 		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
-			opaque::SessionKeys::generate(seed)
+			SessionKeys::generate(seed)
 		}
+	}
 
-		fn decode_session_keys(
-			encoded: Vec<u8>,
-		) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {
-			opaque::SessionKeys::decode_into_raw_public_keys(&encoded)
+	impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
+		fn slot_duration() -> sp_consensus_aura::SlotDuration {
+			sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())
+		}
+
+		fn authorities() -> Vec<AuraId> {
+			Aura::authorities()
+		}
+	}
+
+	impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {
+		fn collect_collation_info() -> cumulus_primitives_core::CollationInfo {
+			ParachainSystem::collect_collation_info()
 		}
 	}
 
@@ -657,7 +530,7 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl amm_rpc::AMMApi<
+	impl xyk_rpc::XYKApi<
 		Block,
 		AccountId,
 		AssetId,
@@ -665,13 +538,13 @@ impl_runtime_apis! {
 	> for Runtime {
 		fn get_pool_balances(
 			pool_address: AccountId,
-		) -> Vec<amm_rpc::BalanceInfo<AssetId, Balance>> {
+		) -> Vec<xyk_rpc::BalanceInfo<AssetId, Balance>> {
 			let mut vec = Vec::new();
 
-			let pool_balances = AMM::get_pool_balances(pool_address).unwrap();
+			let pool_balances = XYK::get_pool_balances(pool_address).unwrap();
 
 			for b in pool_balances {
-				let item  = amm_rpc::BalanceInfo{
+				let item  = xyk_rpc::BalanceInfo{
 				 asset: Some(b.0),
 					amount: b.1
 				};
@@ -715,7 +588,7 @@ impl_runtime_apis! {
 			let mut batches = Vec::<BenchmarkBatch>::new();
 			let params = (&config, &whitelist);
 
-			add_benchmark!(params, batches, amm, AMM);
+			add_benchmark!(params, batches, xyk, XYK);
 			add_benchmark!(params, batches, transaction_multi_payment, MultiBench::<Runtime>);
 			add_benchmark!(params, batches, frame_system, SystemBench::<Runtime>);
 			add_benchmark!(params, batches, exchange, ExchangeBench::<Runtime>);
@@ -728,4 +601,7 @@ impl_runtime_apis! {
 	}
 }
 
-cumulus_pallet_parachain_system::register_validate_block!(Runtime, Executive);
+cumulus_pallet_parachain_system::register_validate_block!(
+	Runtime,
+	cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
+);