diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 931c710955..e6f04dc44a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -144,7 +144,8 @@ test:
     - time cargo fetch
     - time cargo fetch --manifest-path=`cargo metadata --format-version=1 | jq --compact-output --raw-output  ".packages[] | select(.name == \"polkadot-test-runtime\").manifest_path"`
     - time cargo fetch --manifest-path=`cargo metadata --format-version=1 | jq --compact-output --raw-output  ".packages[] | select(.name == \"polkadot-runtime\").manifest_path"`
-    - CARGO_NET_OFFLINE=true time cargo test --verbose --workspace
+    - time cargo fetch --manifest-path=`cargo metadata --format-version=1 | jq --compact-output --raw-output  ".packages[] | select(.name == \"kusama-runtime\").manifest_path"`
+    - CARGO_NET_OFFLINE=true SKIP_POLKADOT_RUNTIME_WASM_BUILD=1 SKIP_KUSAMA_RUNTIME_WASM_BUILD=1 SKIP_POLKADOT_TEST_RUNTIME_WASM_BUILD=1 time cargo test --verbose --workspace
 
 test-nightly:
   stage:                           test
diff --git a/Cargo.lock b/Cargo.lock
index 343a27b41f..eb231e2a39 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -327,9 +327,9 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
 
 [[package]]
 name = "async-trait"
-version = "0.1.52"
+version = "0.1.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3"
+checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -406,9 +406,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.63"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6"
+checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f"
 dependencies = [
  "addr2line",
  "cc",
@@ -461,17 +461,19 @@ dependencies = [
 [[package]]
 name = "beefy-gadget"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "beefy-primitives",
  "fnv",
  "futures 0.3.21",
+ "futures-timer",
  "hex",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.0",
  "sc-chain-spec",
  "sc-client-api",
+ "sc-finality-grandpa",
  "sc-keystore",
  "sc-network",
  "sc-network-gossip",
@@ -480,8 +482,10 @@ dependencies = [
  "sp-application-crypto",
  "sp-arithmetic",
  "sp-blockchain",
+ "sp-consensus",
  "sp-core",
  "sp-keystore",
+ "sp-mmr-primitives",
  "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
@@ -491,7 +495,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "beefy-gadget",
  "beefy-primitives",
@@ -514,12 +518,12 @@ dependencies = [
 [[package]]
 name = "beefy-merkle-tree"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 
 [[package]]
 name = "beefy-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -1014,7 +1018,10 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
 dependencies = [
+ "lazy_static",
  "memchr",
+ "regex-automata",
+ "serde",
 ]
 
 [[package]]
@@ -1363,18 +1370,18 @@ dependencies = [
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.80.0"
+version = "0.82.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9516ba6b2ba47b4cbf63b713f75b432fafa0a0e0464ec8381ec76e6efe931ab3"
+checksum = "38faa2a16616c8e78a18d37b4726b98bfd2de192f2fdc8a39ddf568a408a0f75"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.80.0"
+version = "0.82.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "489e5d0081f7edff6be12d71282a8bf387b5df64d5592454b75d662397f2d642"
+checksum = "26f192472a3ba23860afd07d2b0217dc628f21fcc72617aa1336d98e1671f33b"
 dependencies = [
  "cranelift-bforest",
  "cranelift-codegen-meta",
@@ -1389,33 +1396,33 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.80.0"
+version = "0.82.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d36ee1140371bb0f69100e734b30400157a4adf7b86148dee8b0a438763ead48"
+checksum = "0f32ddb89e9b89d3d9b36a5b7d7ea3261c98235a76ac95ba46826b8ec40b1a24"
 dependencies = [
  "cranelift-codegen-shared",
 ]
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.80.0"
+version = "0.82.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "981da52d8f746af1feb96290c83977ff8d41071a7499e991d8abae0d4869f564"
+checksum = "01fd0d9f288cc1b42d9333b7a776b17e278fc888c28e6a0f09b5573d45a150bc"
 
 [[package]]
 name = "cranelift-entity"
-version = "0.80.0"
+version = "0.82.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2906740053dd3bcf95ce53df0fd9b5649c68ae4bd9adada92b406f059eae461"
+checksum = "9e3bfe172b83167604601faf9dc60453e0d0a93415b57a9c4d1a7ae6849185cf"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.80.0"
+version = "0.82.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7cb156de1097f567d46bf57a0cd720a72c3e15e1a2bd8b1041ba2fc894471b7"
+checksum = "a006e3e32d80ce0e4ba7f1f9ddf66066d052a8c884a110b91d05404d6ce26dce"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -1425,9 +1432,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-native"
-version = "0.80.0"
+version = "0.82.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "166028ca0343a6ee7bddac0e70084e142b23f99c701bd6f6ea9123afac1a7a46"
+checksum = "501241b0cdf903412ec9075385ac9f2b1eb18a89044d1538e97fab603231f70c"
 dependencies = [
  "cranelift-codegen",
  "libc",
@@ -1436,9 +1443,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-wasm"
-version = "0.80.0"
+version = "0.82.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5012a1cde0c8b3898770b711490d803018ae9bec2d60674ba0e5b2058a874f80"
+checksum = "16d9e4211bbc3268042a96dd4de5bd979cda22434991d035f5f8eacba987fad2"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1561,6 +1568,28 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "csv"
+version = "1.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
+dependencies = [
+ "bstr",
+ "csv-core",
+ "itoa 0.4.8",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "csv-core"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "ct-logs"
 version = "0.8.0"
@@ -1603,7 +1632,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-cli"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=master#b468d0c33eac0adda27080b59ea9b5986ce6469b"
+source = "git+https://github.com/paritytech/cumulus?branch=gav-xcm-v3#4453f082d5c3cd6b5d5946964c8569f334ba0911"
 dependencies = [
  "clap 3.1.6",
  "sc-cli",
@@ -1614,7 +1643,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-collator"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=master#b468d0c33eac0adda27080b59ea9b5986ce6469b"
+source = "git+https://github.com/paritytech/cumulus?branch=gav-xcm-v3#4453f082d5c3cd6b5d5946964c8569f334ba0911"
 dependencies = [
  "cumulus-client-consensus-common",
  "cumulus-client-network",
@@ -1638,7 +1667,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-consensus-aura"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=master#b468d0c33eac0adda27080b59ea9b5986ce6469b"
+source = "git+https://github.com/paritytech/cumulus?branch=gav-xcm-v3#4453f082d5c3cd6b5d5946964c8569f334ba0911"
 dependencies = [
  "async-trait",
  "cumulus-client-consensus-common",
@@ -1667,7 +1696,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-consensus-common"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=master#b468d0c33eac0adda27080b59ea9b5986ce6469b"
+source = "git+https://github.com/paritytech/cumulus?branch=gav-xcm-v3#4453f082d5c3cd6b5d5946964c8569f334ba0911"
 dependencies = [
  "async-trait",
  "cumulus-relay-chain-interface",
@@ -1688,7 +1717,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-network"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=master#b468d0c33eac0adda27080b59ea9b5986ce6469b"
+source = "git+https://github.com/paritytech/cumulus?branch=gav-xcm-v3#4453f082d5c3cd6b5d5946964c8569f334ba0911"
 dependencies = [
  "async-trait",
  "cumulus-relay-chain-interface",
@@ -1713,7 +1742,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-pov-recovery"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=master#b468d0c33eac0adda27080b59ea9b5986ce6469b"
+source = "git+https://github.com/paritytech/cumulus?branch=gav-xcm-v3#4453f082d5c3cd6b5d5946964c8569f334ba0911"
 dependencies = [
  "cumulus-primitives-core",
  "cumulus-relay-chain-interface",
@@ -1737,7 +1766,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-service"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=master#b468d0c33eac0adda27080b59ea9b5986ce6469b"
+source = "git+https://github.com/paritytech/cumulus?branch=gav-xcm-v3#4453f082d5c3cd6b5d5946964c8569f334ba0911"
 dependencies = [
  "cumulus-client-cli",
  "cumulus-client-collator",
@@ -1767,7 +1796,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-aura-ext"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=master#b468d0c33eac0adda27080b59ea9b5986ce6469b"
+source = "git+https://github.com/paritytech/cumulus?branch=gav-xcm-v3#4453f082d5c3cd6b5d5946964c8569f334ba0911"
 dependencies = [
  "frame-executive",
  "frame-support",
@@ -1785,7 +1814,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-dmp-queue"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=master#b468d0c33eac0adda27080b59ea9b5986ce6469b"
+source = "git+https://github.com/paritytech/cumulus?branch=gav-xcm-v3#4453f082d5c3cd6b5d5946964c8569f334ba0911"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -1803,7 +1832,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-parachain-system"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=master#b468d0c33eac0adda27080b59ea9b5986ce6469b"
+source = "git+https://github.com/paritytech/cumulus?branch=gav-xcm-v3#4453f082d5c3cd6b5d5946964c8569f334ba0911"
 dependencies = [
  "cumulus-pallet-parachain-system-proc-macro",
  "cumulus-primitives-core",
@@ -1833,7 +1862,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-parachain-system-proc-macro"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=master#b468d0c33eac0adda27080b59ea9b5986ce6469b"
+source = "git+https://github.com/paritytech/cumulus?branch=gav-xcm-v3#4453f082d5c3cd6b5d5946964c8569f334ba0911"
 dependencies = [
  "proc-macro-crate 1.1.3",
  "proc-macro2",
@@ -1844,7 +1873,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-xcm"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=master#b468d0c33eac0adda27080b59ea9b5986ce6469b"
+source = "git+https://github.com/paritytech/cumulus?branch=gav-xcm-v3#4453f082d5c3cd6b5d5946964c8569f334ba0911"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -1861,15 +1890,17 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-xcmp-queue"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=master#b468d0c33eac0adda27080b59ea9b5986ce6469b"
+source = "git+https://github.com/paritytech/cumulus?branch=gav-xcm-v3#4453f082d5c3cd6b5d5946964c8569f334ba0911"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
  "frame-system",
  "log",
  "parity-scale-codec",
+ "polkadot-runtime-common",
  "rand_chacha 0.3.1",
  "scale-info",
+ "sp-io",
  "sp-runtime",
  "sp-std",
  "xcm",
@@ -1879,7 +1910,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-core"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=master#b468d0c33eac0adda27080b59ea9b5986ce6469b"
+source = "git+https://github.com/paritytech/cumulus?branch=gav-xcm-v3#4453f082d5c3cd6b5d5946964c8569f334ba0911"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -1895,7 +1926,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-parachain-inherent"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=master#b468d0c33eac0adda27080b59ea9b5986ce6469b"
+source = "git+https://github.com/paritytech/cumulus?branch=gav-xcm-v3#4453f082d5c3cd6b5d5946964c8569f334ba0911"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -1918,7 +1949,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-timestamp"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=master#b468d0c33eac0adda27080b59ea9b5986ce6469b"
+source = "git+https://github.com/paritytech/cumulus?branch=gav-xcm-v3#4453f082d5c3cd6b5d5946964c8569f334ba0911"
 dependencies = [
  "cumulus-primitives-core",
  "futures 0.3.21",
@@ -1931,7 +1962,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-utility"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=master#b468d0c33eac0adda27080b59ea9b5986ce6469b"
+source = "git+https://github.com/paritytech/cumulus?branch=gav-xcm-v3#4453f082d5c3cd6b5d5946964c8569f334ba0911"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -1939,6 +1970,8 @@ dependencies = [
  "polkadot-core-primitives",
  "polkadot-parachain",
  "polkadot-primitives",
+ "polkadot-runtime-common",
+ "sp-io",
  "sp-runtime",
  "sp-std",
  "sp-trie",
@@ -1948,7 +1981,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-inprocess-interface"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=master#b468d0c33eac0adda27080b59ea9b5986ce6469b"
+source = "git+https://github.com/paritytech/cumulus?branch=gav-xcm-v3#4453f082d5c3cd6b5d5946964c8569f334ba0911"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -1976,13 +2009,13 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-interface"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=master#b468d0c33eac0adda27080b59ea9b5986ce6469b"
+source = "git+https://github.com/paritytech/cumulus?branch=gav-xcm-v3#4453f082d5c3cd6b5d5946964c8569f334ba0911"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
  "derive_more",
  "futures 0.3.21",
- "jsonrpsee-core 0.9.0",
+ "jsonrpsee-core 0.10.1",
  "parity-scale-codec",
  "parking_lot 0.12.0",
  "polkadot-overseer",
@@ -2000,7 +2033,7 @@ dependencies = [
 [[package]]
 name = "cumulus-test-relay-sproof-builder"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=master#b468d0c33eac0adda27080b59ea9b5986ce6469b"
+source = "git+https://github.com/paritytech/cumulus?branch=gav-xcm-v3#4453f082d5c3cd6b5d5946964c8569f334ba0911"
 dependencies = [
  "cumulus-primitives-core",
  "parity-scale-codec",
@@ -2174,6 +2207,17 @@ dependencies = [
  "dirs-sys-next",
 ]
 
+[[package]]
+name = "dirs"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
+dependencies = [
+ "libc",
+ "redox_users 0.3.5",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "dirs-sys"
 version = "0.3.6"
@@ -2181,7 +2225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"
 dependencies = [
  "libc",
- "redox_users",
+ "redox_users 0.4.0",
  "winapi 0.3.9",
 ]
 
@@ -2192,7 +2236,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
 dependencies = [
  "libc",
- "redox_users",
+ "redox_users 0.4.0",
  "winapi 0.3.9",
 ]
 
@@ -2309,6 +2353,12 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "encode_unicode"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+
 [[package]]
 name = "encoding_rs"
 version = "0.8.29"
@@ -2332,18 +2382,18 @@ dependencies = [
 
 [[package]]
 name = "enumflags2"
-version = "0.6.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83c8d82922337cd23a15f88b70d8e4ef5f11da38dd7cdb55e84dd5de99695da0"
+checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb"
 dependencies = [
  "enumflags2_derive",
 ]
 
 [[package]]
 name = "enumflags2_derive"
-version = "0.6.4"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce"
+checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2613,7 +2663,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2631,7 +2681,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2653,13 +2703,14 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "Inflector",
  "chrono",
  "clap 3.1.6",
  "frame-benchmarking",
  "frame-support",
+ "frame-system",
  "handlebars",
  "hash-db",
  "hex",
@@ -2669,13 +2720,16 @@ dependencies = [
  "log",
  "memory-db",
  "parity-scale-codec",
+ "prettytable-rs",
  "rand 0.8.5",
+ "rand_pcg 0.3.1",
  "sc-block-builder",
  "sc-cli",
  "sc-client-api",
  "sc-client-db",
  "sc-executor",
  "sc-service",
+ "sc-sysinfo",
  "serde",
  "serde_json",
  "serde_nanos",
@@ -2688,15 +2742,16 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-state-machine",
- "sp-std",
  "sp-storage",
  "sp-trie",
+ "tempfile",
+ "thousands",
 ]
 
 [[package]]
 name = "frame-election-provider-solution-type"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#65b44e91bedd6961ef30cef08e89273b7d98b4ed"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "proc-macro-crate 1.1.3",
  "proc-macro2",
@@ -2707,7 +2762,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-election-provider-solution-type",
  "frame-support",
@@ -2723,7 +2778,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2751,7 +2806,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -2780,7 +2835,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -2792,7 +2847,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 1.1.3",
@@ -2804,7 +2859,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2814,7 +2869,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "log",
@@ -2831,7 +2886,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2846,7 +2901,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2855,7 +2910,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "sp-api",
@@ -3170,15 +3225,15 @@ dependencies = [
  "indexmap",
  "slab",
  "tokio",
- "tokio-util",
+ "tokio-util 0.6.9",
  "tracing",
 ]
 
 [[package]]
 name = "handlebars"
-version = "4.2.1"
+version = "4.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25546a65e5cf1f471f3438796fc634650b31d7fcde01d444c309aeb28b92e3a8"
+checksum = "99d6a30320f094710245150395bc763ad23128d6a1ebbad7594dc4164b62c56b"
 dependencies = [
  "log",
  "pest",
@@ -3496,9 +3551,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223"
+checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee"
 dependencies = [
  "autocfg",
  "hashbrown 0.11.2",
@@ -3531,12 +3586,9 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "0.4.4"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ef6787e7f0faedc040f95716bdd0e62bcfcf4ba93da053b62dea2691c13864"
-dependencies = [
- "winapi 0.3.9",
-]
+checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6"
 
 [[package]]
 name = "iovec"
@@ -3763,7 +3815,7 @@ dependencies = [
  "log",
  "tokio",
  "tokio-stream",
- "tokio-util",
+ "tokio-util 0.6.9",
  "unicase",
 ]
 
@@ -3784,25 +3836,26 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee"
-version = "0.4.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6373a33d987866ccfe1af4bc11b089dce941764313f9fd8b7cf13fcb51b72dc5"
+checksum = "05fd8cd6c6b1bbd06881d2cf88f1fc83cc36c98f2219090f839115fb4a956cb9"
 dependencies = [
- "jsonrpsee-types 0.4.1",
- "jsonrpsee-utils",
- "jsonrpsee-ws-client 0.4.1",
+ "jsonrpsee-core 0.8.0",
+ "jsonrpsee-proc-macros 0.8.0",
+ "jsonrpsee-types 0.8.0",
+ "jsonrpsee-ws-client 0.8.0",
 ]
 
 [[package]]
 name = "jsonrpsee"
-version = "0.8.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05fd8cd6c6b1bbd06881d2cf88f1fc83cc36c98f2219090f839115fb4a956cb9"
+checksum = "91dc760c341fa81173f9a434931aaf32baad5552b0230cc6c93e8fb7eaad4c19"
 dependencies = [
- "jsonrpsee-core 0.8.0",
- "jsonrpsee-proc-macros",
- "jsonrpsee-types 0.8.0",
- "jsonrpsee-ws-client 0.8.0",
+ "jsonrpsee-core 0.10.1",
+ "jsonrpsee-proc-macros 0.10.1",
+ "jsonrpsee-types 0.10.1",
+ "jsonrpsee-ws-client 0.10.1",
 ]
 
 [[package]]
@@ -3821,7 +3874,28 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-rustls 0.23.2",
- "tokio-util",
+ "tokio-util 0.6.9",
+ "tracing",
+ "webpki-roots 0.22.2",
+]
+
+[[package]]
+name = "jsonrpsee-client-transport"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "765f7a36d5087f74e3b3b47805c2188fef8eb54afcb587b078d9f8ebfe9c7220"
+dependencies = [
+ "futures 0.3.21",
+ "http",
+ "jsonrpsee-core 0.10.1",
+ "jsonrpsee-types 0.10.1",
+ "pin-project 1.0.10",
+ "rustls-native-certs 0.6.1",
+ "soketto",
+ "thiserror",
+ "tokio",
+ "tokio-rustls 0.23.2",
+ "tokio-util 0.7.1",
  "tracing",
  "webpki-roots 0.22.2",
 ]
@@ -3851,21 +3925,25 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-core"
-version = "0.9.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22abc3274b265dcefe2e26c4beecf9fda4fffa48cf94930443a6c73678f020d5"
+checksum = "82ef77ecd20c2254d54f5da8c0738eacca61e6b6511268a8f2753e3148c6c706"
 dependencies = [
  "anyhow",
  "arrayvec 0.7.2",
  "async-trait",
  "beef",
  "futures-channel",
+ "futures-util",
  "hyper",
- "jsonrpsee-types 0.9.0",
+ "jsonrpsee-types 0.10.1",
+ "rustc-hash",
  "serde",
  "serde_json",
  "soketto",
  "thiserror",
+ "tokio",
+ "tracing",
 ]
 
 [[package]]
@@ -3881,22 +3959,15 @@ dependencies = [
 ]
 
 [[package]]
-name = "jsonrpsee-types"
-version = "0.4.1"
+name = "jsonrpsee-proc-macros"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f778cf245158fbd8f5d50823a2e9e4c708a40be164766bd35e9fb1d86715b2"
+checksum = "b7291c72805bc7d413b457e50d8ef3e87aa554da65ecbbc278abb7dfc283e7f0"
 dependencies = [
- "anyhow",
- "async-trait",
- "beef",
- "futures-channel",
- "futures-util",
- "hyper",
- "log",
- "serde",
- "serde_json",
- "soketto",
- "thiserror",
+ "proc-macro-crate 1.1.3",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -3915,9 +3986,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.9.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f4c45d2e2aa1db4c7d7d7dbaabc10a5b5258d99cd9d42fbfd5260b76f80c324"
+checksum = "38b6aa52f322cbf20c762407629b8300f39bcc0cf0619840d9252a2f65fd2dd9"
 dependencies = [
  "anyhow",
  "beef",
@@ -3927,50 +3998,26 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "jsonrpsee-utils"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0109c4f972058f3b1925b73a17210aff7b63b65967264d0045d15ee88fe84f0c"
-dependencies = [
- "arrayvec 0.7.2",
- "beef",
- "jsonrpsee-types 0.4.1",
-]
-
 [[package]]
 name = "jsonrpsee-ws-client"
-version = "0.4.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "559aa56fc402af206c00fc913dc2be1d9d788dcde045d14df141a535245d35ef"
+checksum = "aff425cee7c779e33920913bc695447416078ee6d119f443f3060feffa4e86b5"
 dependencies = [
- "arrayvec 0.7.2",
- "async-trait",
- "fnv",
- "futures 0.3.21",
- "http",
- "jsonrpsee-types 0.4.1",
- "log",
- "pin-project 1.0.10",
- "rustls-native-certs 0.5.0",
- "serde",
- "serde_json",
- "soketto",
- "thiserror",
- "tokio",
- "tokio-rustls 0.22.0",
- "tokio-util",
+ "jsonrpsee-client-transport 0.8.0",
+ "jsonrpsee-core 0.8.0",
+ "jsonrpsee-types 0.8.0",
 ]
 
 [[package]]
 name = "jsonrpsee-ws-client"
-version = "0.8.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aff425cee7c779e33920913bc695447416078ee6d119f443f3060feffa4e86b5"
+checksum = "dd66d18bab78d956df24dd0d2e41e4c00afbb818fda94a98264bdd12ce8506ac"
 dependencies = [
- "jsonrpsee-client-transport",
- "jsonrpsee-core 0.8.0",
- "jsonrpsee-types 0.8.0",
+ "jsonrpsee-client-transport 0.10.1",
+ "jsonrpsee-core 0.10.1",
+ "jsonrpsee-types 0.10.1",
 ]
 
 [[package]]
@@ -4003,8 +4050,8 @@ dependencies = [
 
 [[package]]
 name = "kusama-runtime"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -4033,7 +4080,6 @@ dependencies = [
  "pallet-im-online",
  "pallet-indices",
  "pallet-membership",
- "pallet-mmr-primitives",
  "pallet-multisig",
  "pallet-nicks",
  "pallet-offences",
@@ -4070,6 +4116,7 @@ dependencies = [
  "sp-core",
  "sp-inherents",
  "sp-io",
+ "sp-mmr-primitives",
  "sp-npos-elections",
  "sp-offchain",
  "sp-runtime",
@@ -4087,8 +4134,8 @@ dependencies = [
 
 [[package]]
 name = "kusama-runtime-constants"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -4129,9 +4176,9 @@ dependencies = [
 
 [[package]]
 name = "kvdb-rocksdb"
-version = "0.15.1"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e72a631a32527fafe22d0751c002e67d28173c49dcaecf79d1aaa323c520e9"
+checksum = "ca7fbdfd71cd663dceb0faf3367a99f8cf724514933e9867cec4995b6027cbc1"
 dependencies = [
  "fs-swap",
  "kvdb",
@@ -4159,9 +4206,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.120"
+version = "0.2.123"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad5c14e80759d0939d013e6ca49930e59fc53dd8e5009132f76240c179380c09"
+checksum = "cb691a747a7ab48abc15c5b42066eaafde10dc427e3b6ee2a1cf43db04c763bd"
 
 [[package]]
 name = "libloading"
@@ -4565,7 +4612,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "lru 0.7.3",
+ "lru 0.7.5",
  "rand 0.7.3",
  "smallvec",
  "unsigned-varint 0.7.1",
@@ -4774,9 +4821,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.0.36"
+version = "0.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a261afc61b7a5e323933b402ca6a1765183687c614789b1e4db7762ed4230bca"
+checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7"
 
 [[package]]
 name = "lock_api"
@@ -4808,9 +4855,9 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.7.3"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb87f3080f6d1d69e8c564c0fcfde1d7aa8cc451ce40cae89479111f03bc0eb"
+checksum = "32613e41de4c47ab04970c348ca7ae7382cf116625755af070b008a15516a889"
 dependencies = [
  "hashbrown 0.11.2",
 ]
@@ -4990,8 +5037,8 @@ dependencies = [
 
 [[package]]
 name = "metered-channel"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "coarsetime",
  "crossbeam-queue",
@@ -5086,7 +5133,6 @@ dependencies = [
  "pallet-bridge-token-swap",
  "pallet-grandpa",
  "pallet-mmr",
- "pallet-mmr-primitives",
  "pallet-randomness-collective-flip",
  "pallet-session",
  "pallet-shift-session-manager",
@@ -5103,6 +5149,7 @@ dependencies = [
  "sp-core",
  "sp-finality-grandpa",
  "sp-inherents",
+ "sp-mmr-primitives",
  "sp-offchain",
  "sp-runtime",
  "sp-session",
@@ -5359,7 +5406,7 @@ dependencies = [
 [[package]]
 name = "node-inspect"
 version = "0.9.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "clap 3.1.6",
  "parity-scale-codec",
@@ -5510,9 +5557,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
+checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
 
 [[package]]
 name = "opaque-debug"
@@ -5598,7 +5645,7 @@ dependencies = [
 [[package]]
 name = "pallet-aura"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5614,7 +5661,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5630,7 +5677,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5645,7 +5692,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5669,7 +5716,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-election-provider-support",
  "frame-support",
@@ -5684,7 +5731,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5699,7 +5746,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "beefy-primitives",
  "frame-support",
@@ -5715,7 +5762,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "beefy-merkle-tree",
  "beefy-primitives",
@@ -5726,7 +5773,6 @@ dependencies = [
  "log",
  "pallet-beefy",
  "pallet-mmr",
- "pallet-mmr-primitives",
  "pallet-session",
  "parity-scale-codec",
  "scale-info",
@@ -5740,7 +5786,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5845,7 +5891,7 @@ dependencies = [
 [[package]]
 name = "pallet-child-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#65b44e91bedd6961ef30cef08e89273b7d98b4ed"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5863,7 +5909,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5880,7 +5926,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5896,7 +5942,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5919,7 +5965,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5936,7 +5982,7 @@ dependencies = [
 [[package]]
 name = "pallet-gilt"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5951,7 +5997,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5974,7 +6020,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -5990,7 +6036,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6009,7 +6055,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6025,7 +6071,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6042,33 +6088,17 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "ckb-merkle-mountain-range",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "pallet-mmr-primitives",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
  "sp-io",
- "sp-runtime",
- "sp-std",
-]
-
-[[package]]
-name = "pallet-mmr-primitives"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
-dependencies = [
- "frame-support",
- "frame-system",
- "log",
- "parity-scale-codec",
- "serde",
- "sp-api",
- "sp-core",
+ "sp-mmr-primitives",
  "sp-runtime",
  "sp-std",
 ]
@@ -6076,24 +6106,24 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
  "jsonrpc-derive",
- "pallet-mmr-primitives",
  "parity-scale-codec",
  "serde",
  "sp-api",
  "sp-blockchain",
  "sp-core",
+ "sp-mmr-primitives",
  "sp-runtime",
 ]
 
 [[package]]
 name = "pallet-multisig"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6107,7 +6137,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6121,7 +6151,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6138,7 +6168,7 @@ dependencies = [
 [[package]]
 name = "pallet-preimage"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6154,7 +6184,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6168,7 +6198,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6182,7 +6212,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6196,7 +6226,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6212,7 +6242,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6248,7 +6278,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6262,7 +6292,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-election-provider-support",
  "frame-support",
@@ -6283,7 +6313,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "proc-macro-crate 1.1.3",
  "proc-macro2",
@@ -6294,7 +6324,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -6303,7 +6333,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6317,7 +6347,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6335,7 +6365,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6353,7 +6383,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6370,7 +6400,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -6387,7 +6417,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -6398,7 +6428,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6414,7 +6444,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6429,7 +6459,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6442,8 +6472,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-xcm"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6452,6 +6482,7 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core",
+ "sp-io",
  "sp-runtime",
  "sp-std",
  "xcm",
@@ -6461,7 +6492,7 @@ dependencies = [
 [[package]]
 name = "parachain-info"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=master#b468d0c33eac0adda27080b59ea9b5986ce6469b"
+source = "git+https://github.com/paritytech/cumulus?branch=gav-xcm-v3#4453f082d5c3cd6b5d5946964c8569f334ba0911"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -6473,9 +6504,9 @@ dependencies = [
 
 [[package]]
 name = "parity-db"
-version = "0.3.9"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d121a9af17a43efd0a38c6afa508b927ba07785bd4709efb2ac03bf77efef8d"
+checksum = "b3e7f385d61562f5834282b90aa50b41f38a35cf64d5209b8b05487b50553dbe"
 dependencies = [
  "blake2-rfc",
  "crc32fast",
@@ -6632,7 +6663,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "instant",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.10",
  "smallvec",
  "winapi 0.3.9",
 ]
@@ -6645,7 +6676,7 @@ checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.10",
  "smallvec",
  "windows-sys",
 ]
@@ -6828,8 +6859,8 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94"
 
 [[package]]
 name = "polkadot-approval-distribution"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "futures 0.3.21",
  "polkadot-node-network-protocol",
@@ -6842,8 +6873,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-availability-bitfield-distribution"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "futures 0.3.21",
  "polkadot-node-network-protocol",
@@ -6855,13 +6886,13 @@ dependencies = [
 
 [[package]]
 name = "polkadot-availability-distribution"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "derive_more",
  "fatality",
  "futures 0.3.21",
- "lru 0.7.3",
+ "lru 0.7.5",
  "parity-scale-codec",
  "polkadot-erasure-coding",
  "polkadot-node-network-protocol",
@@ -6878,12 +6909,12 @@ dependencies = [
 
 [[package]]
 name = "polkadot-availability-recovery"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "fatality",
  "futures 0.3.21",
- "lru 0.7.3",
+ "lru 0.7.5",
  "parity-scale-codec",
  "polkadot-erasure-coding",
  "polkadot-node-network-protocol",
@@ -6899,13 +6930,14 @@ dependencies = [
 
 [[package]]
 name = "polkadot-cli"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "clap 3.1.6",
  "frame-benchmarking-cli",
  "futures 0.3.21",
  "log",
+ "polkadot-client",
  "polkadot-node-core-pvf",
  "polkadot-node-metrics",
  "polkadot-performance-test",
@@ -6922,16 +6954,21 @@ dependencies = [
 
 [[package]]
 name = "polkadot-client"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "beefy-primitives",
  "frame-benchmarking",
+ "frame-benchmarking-cli",
+ "frame-system",
  "frame-system-rpc-runtime-api",
- "pallet-mmr-primitives",
+ "pallet-transaction-payment",
  "pallet-transaction-payment-rpc-runtime-api",
+ "polkadot-core-primitives",
+ "polkadot-node-core-parachains-inherent",
  "polkadot-primitives",
  "polkadot-runtime",
+ "polkadot-runtime-common",
  "sc-client-api",
  "sc-consensus",
  "sc-executor",
@@ -6942,18 +6979,23 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
+ "sp-core",
  "sp-finality-grandpa",
+ "sp-inherents",
+ "sp-keyring",
+ "sp-mmr-primitives",
  "sp-offchain",
  "sp-runtime",
  "sp-session",
  "sp-storage",
+ "sp-timestamp",
  "sp-transaction-pool",
 ]
 
 [[package]]
 name = "polkadot-collator-protocol"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "always-assert",
  "fatality",
@@ -6973,8 +7015,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-core-primitives"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
@@ -6986,13 +7028,13 @@ dependencies = [
 
 [[package]]
 name = "polkadot-dispute-distribution"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "derive_more",
  "fatality",
  "futures 0.3.21",
- "lru 0.7.3",
+ "lru 0.7.5",
  "parity-scale-codec",
  "polkadot-erasure-coding",
  "polkadot-node-network-protocol",
@@ -7009,8 +7051,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-erasure-coding"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-primitives",
@@ -7023,8 +7065,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-gossip-support"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -7043,8 +7085,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-network-bridge"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -7062,8 +7104,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-collation-generation"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "futures 0.3.21",
  "parity-scale-codec",
@@ -7080,15 +7122,15 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-approval-voting"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "bitvec",
  "derive_more",
  "futures 0.3.21",
  "futures-timer",
  "kvdb",
- "lru 0.7.3",
+ "lru 0.7.5",
  "merlin",
  "parity-scale-codec",
  "polkadot-node-jaeger",
@@ -7103,13 +7145,14 @@ dependencies = [
  "sp-consensus",
  "sp-consensus-slots",
  "sp-runtime",
+ "thiserror",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-node-core-av-store"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "bitvec",
  "futures 0.3.21",
@@ -7128,8 +7171,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-backing"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "bitvec",
  "futures 0.3.21",
@@ -7146,8 +7189,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-bitfield-signing"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "futures 0.3.21",
  "polkadot-node-subsystem",
@@ -7161,8 +7204,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-candidate-validation"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -7179,8 +7222,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-chain-api"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "futures 0.3.21",
  "polkadot-node-subsystem",
@@ -7194,8 +7237,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-chain-selection"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -7211,13 +7254,13 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-dispute-coordinator"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "fatality",
  "futures 0.3.21",
  "kvdb",
- "lru 0.7.3",
+ "lru 0.7.5",
  "parity-scale-codec",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
@@ -7230,8 +7273,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-parachains-inherent"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -7247,8 +7290,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-provisioner"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "bitvec",
  "futures 0.3.21",
@@ -7264,8 +7307,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-pvf"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "always-assert",
  "assert_matches",
@@ -7294,8 +7337,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-pvf-checker"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "futures 0.3.21",
  "polkadot-node-primitives",
@@ -7310,8 +7353,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-runtime-api"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "futures 0.3.21",
  "memory-lru",
@@ -7328,8 +7371,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-jaeger"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "async-std",
  "lazy_static",
@@ -7346,8 +7389,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-metrics"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "bs58",
  "futures 0.3.21",
@@ -7365,8 +7408,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-network-protocol"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "async-trait",
  "fatality",
@@ -7383,8 +7426,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-primitives"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "bounded-vec",
  "futures 0.3.21",
@@ -7405,8 +7448,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-subsystem"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-node-subsystem-types",
@@ -7415,8 +7458,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-subsystem-types"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "derive_more",
  "futures 0.3.21",
@@ -7434,8 +7477,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-subsystem-util"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7443,7 +7486,7 @@ dependencies = [
  "futures 0.3.21",
  "itertools",
  "kvdb",
- "lru 0.7.3",
+ "lru 0.7.5",
  "metered-channel",
  "parity-db",
  "parity-scale-codec",
@@ -7467,12 +7510,12 @@ dependencies = [
 
 [[package]]
 name = "polkadot-overseer"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
- "lru 0.7.3",
+ "lru 0.7.5",
  "parity-util-mem",
  "parking_lot 0.12.0",
  "polkadot-node-metrics",
@@ -7488,8 +7531,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-overseer-gen"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -7505,8 +7548,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-overseer-gen-proc-macro"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "expander 0.0.6",
  "proc-macro-crate 1.1.3",
@@ -7517,8 +7560,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-parachain"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "derive_more",
  "frame-support",
@@ -7534,8 +7577,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-performance-test"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "env_logger 0.9.0",
  "kusama-runtime",
@@ -7549,8 +7592,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-primitives"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "bitvec",
  "frame-system",
@@ -7579,8 +7622,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-rpc"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "beefy-gadget",
  "beefy-gadget-rpc",
@@ -7606,12 +7649,13 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "substrate-frame-rpc-system",
+ "substrate-state-trie-migration-rpc",
 ]
 
 [[package]]
 name = "polkadot-runtime"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -7638,7 +7682,6 @@ dependencies = [
  "pallet-im-online",
  "pallet-indices",
  "pallet-membership",
- "pallet-mmr-primitives",
  "pallet-multisig",
  "pallet-nicks",
  "pallet-offences",
@@ -7673,6 +7716,7 @@ dependencies = [
  "sp-core",
  "sp-inherents",
  "sp-io",
+ "sp-mmr-primitives",
  "sp-npos-elections",
  "sp-offchain",
  "sp-runtime",
@@ -7690,8 +7734,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-common"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -7735,8 +7779,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-constants"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -7747,8 +7791,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-metrics"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "bs58",
  "parity-scale-codec",
@@ -7759,8 +7803,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-parachains"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "bitflags",
  "bitvec",
@@ -7799,8 +7843,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-service"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "async-trait",
  "beefy-gadget",
@@ -7810,10 +7854,9 @@ dependencies = [
  "hex-literal",
  "kvdb",
  "kvdb-rocksdb",
- "lru 0.7.3",
+ "lru 0.7.5",
  "pallet-babe",
  "pallet-im-online",
- "pallet-mmr-primitives",
  "pallet-staking",
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-db",
@@ -7897,8 +7940,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-statement-distribution"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "arrayvec 0.5.2",
  "fatality",
@@ -7918,8 +7961,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-statement-table"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
@@ -7928,8 +7971,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-test-runtime"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "beefy-primitives",
  "bitvec",
@@ -7945,7 +7988,6 @@ dependencies = [
  "pallet-balances",
  "pallet-grandpa",
  "pallet-indices",
- "pallet-mmr-primitives",
  "pallet-nicks",
  "pallet-offences",
  "pallet-session",
@@ -7974,6 +8016,7 @@ dependencies = [
  "sp-core",
  "sp-inherents",
  "sp-io",
+ "sp-mmr-primitives",
  "sp-offchain",
  "sp-runtime",
  "sp-session",
@@ -7990,8 +8033,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-test-service"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "frame-benchmarking",
  "frame-system",
@@ -8084,6 +8127,20 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"
 
+[[package]]
+name = "prettytable-rs"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fd04b170004fa2daccf418a7f8253aaf033c27760b5f225889024cf66d7ac2e"
+dependencies = [
+ "atty",
+ "csv",
+ "encode_unicode",
+ "lazy_static",
+ "term",
+ "unicode-width",
+]
+
 [[package]]
 name = "primitive-types"
 version = "0.11.1"
@@ -8142,9 +8199,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
+checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
 dependencies = [
  "unicode-xid",
 ]
@@ -8250,9 +8307,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58"
+checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
 dependencies = [
  "proc-macro2",
 ]
@@ -8274,7 +8331,7 @@ dependencies = [
  "rand_chacha 0.2.2",
  "rand_core 0.5.1",
  "rand_hc",
- "rand_pcg",
+ "rand_pcg 0.2.1",
 ]
 
 [[package]]
@@ -8354,6 +8411,15 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
+[[package]]
+name = "rand_pcg"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e"
+dependencies = [
+ "rand_core 0.6.3",
+]
+
 [[package]]
 name = "rawpointer"
 version = "0.2.1"
@@ -8385,6 +8451,12 @@ dependencies = [
  "num_cpus",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
+
 [[package]]
 name = "redox_syscall"
 version = "0.2.10"
@@ -8394,6 +8466,17 @@ 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"
@@ -8401,7 +8484,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
 dependencies = [
  "getrandom 0.2.3",
- "redox_syscall",
+ "redox_syscall 0.2.10",
 ]
 
 [[package]]
@@ -8439,9 +8522,9 @@ dependencies = [
 
 [[package]]
 name = "regalloc"
-version = "0.0.33"
+version = "0.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d808cff91dfca7b239d40b972ba628add94892b1d9e19a842aedc5cfae8ab1a"
+checksum = "62446b1d3ebf980bdc68837700af1d77b37bc430e524bf95319c6eada2a4cc02"
 dependencies = [
  "log",
  "rustc-hash",
@@ -8701,10 +8784,10 @@ dependencies = [
 [[package]]
 name = "remote-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "env_logger 0.9.0",
- "jsonrpsee 0.8.0",
+ "jsonrpsee 0.10.1",
  "log",
  "parity-scale-codec",
  "serde",
@@ -8757,10 +8840,9 @@ dependencies = [
  "jsonrpc-core",
  "kvdb",
  "kvdb-rocksdb",
- "lru 0.7.3",
+ "lru 0.7.5",
  "node-inspect",
  "pallet-bridge-messages",
- "pallet-mmr-primitives",
  "pallet-mmr-rpc",
  "pallet-transaction-payment-rpc",
  "pallet-transaction-payment-rpc-runtime-api",
@@ -8797,6 +8879,7 @@ dependencies = [
  "sp-core",
  "sp-finality-grandpa",
  "sp-inherents",
+ "sp-mmr-primitives",
  "sp-offchain",
  "sp-runtime",
  "sp-session",
@@ -8951,7 +9034,6 @@ dependencies = [
  "pallet-bridge-messages",
  "pallet-grandpa",
  "pallet-mmr",
- "pallet-mmr-primitives",
  "pallet-session",
  "pallet-shift-session-manager",
  "pallet-sudo",
@@ -8972,6 +9054,7 @@ dependencies = [
  "sp-finality-grandpa",
  "sp-inherents",
  "sp-io",
+ "sp-mmr-primitives",
  "sp-offchain",
  "sp-runtime",
  "sp-session",
@@ -9018,6 +9101,18 @@ 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",
+ "blake2b_simd",
+ "constant_time_eq",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.21"
@@ -9065,9 +9160,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.31.3"
+version = "0.33.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2dcfc2778a90e38f56a708bfc90572422e11d6c7ee233d053d1f782cf9df6d2"
+checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0"
 dependencies = [
  "bitflags",
  "errno",
@@ -9188,7 +9283,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "log",
  "sp-core",
@@ -9199,7 +9294,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -9226,7 +9321,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -9249,7 +9344,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -9265,7 +9360,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "impl-trait-for-tuples",
  "memmap2 0.5.0",
@@ -9282,7 +9377,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "proc-macro-crate 1.1.3",
  "proc-macro2",
@@ -9293,7 +9388,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "chrono",
  "clap 3.1.6",
@@ -9331,7 +9426,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "fnv",
  "futures 0.3.21",
@@ -9359,7 +9454,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -9384,7 +9479,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -9408,7 +9503,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -9437,7 +9532,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -9480,7 +9575,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "futures 0.3.21",
  "jsonrpc-core",
@@ -9504,7 +9599,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -9517,7 +9612,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -9542,7 +9637,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "sc-client-api",
  "sp-authorship",
@@ -9553,10 +9648,10 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "lazy_static",
- "lru 0.6.6",
+ "lru 0.7.5",
  "parity-scale-codec",
  "parking_lot 0.12.0",
  "sc-executor-common",
@@ -9580,7 +9675,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -9597,7 +9692,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9613,7 +9708,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -9631,7 +9726,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "ahash",
  "async-trait",
@@ -9671,7 +9766,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "finality-grandpa",
  "futures 0.3.21",
@@ -9695,7 +9790,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.21",
@@ -9712,7 +9807,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "async-trait",
  "hex",
@@ -9727,7 +9822,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "async-trait",
  "asynchronous-codec 0.5.0",
@@ -9745,7 +9840,7 @@ dependencies = [
  "linked-hash-map",
  "linked_hash_set",
  "log",
- "lru 0.7.3",
+ "lru 0.7.5",
  "parity-scale-codec",
  "parking_lot 0.12.0",
  "pin-project 1.0.10",
@@ -9776,14 +9871,14 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "ahash",
  "futures 0.3.21",
  "futures-timer",
  "libp2p",
  "log",
- "lru 0.7.3",
+ "lru 0.7.5",
  "sc-network",
  "sp-runtime",
  "substrate-prometheus-endpoint",
@@ -9793,7 +9888,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "bytes 1.1.0",
  "fnv",
@@ -9821,7 +9916,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "futures 0.3.21",
  "libp2p",
@@ -9834,7 +9929,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -9843,7 +9938,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "futures 0.3.21",
  "hash-db",
@@ -9874,7 +9969,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "futures 0.3.21",
  "jsonrpc-core",
@@ -9900,7 +9995,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "futures 0.3.21",
  "jsonrpc-core",
@@ -9917,7 +10012,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "async-trait",
  "directories",
@@ -9945,6 +10040,7 @@ dependencies = [
  "sc-offchain",
  "sc-rpc",
  "sc-rpc-server",
+ "sc-sysinfo",
  "sc-telemetry",
  "sc-tracing",
  "sc-transaction-pool",
@@ -9981,7 +10077,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9995,7 +10091,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -10013,10 +10109,29 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "sc-sysinfo"
+version = "6.0.0-dev"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
+dependencies = [
+ "futures 0.3.21",
+ "libc",
+ "log",
+ "rand 0.7.3",
+ "rand_pcg 0.2.1",
+ "regex",
+ "sc-telemetry",
+ "serde",
+ "serde_json",
+ "sp-core",
+ "sp-io",
+ "sp-std",
+]
+
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "chrono",
  "futures 0.3.21",
@@ -10034,7 +10149,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -10065,7 +10180,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "proc-macro-crate 1.1.3",
  "proc-macro2",
@@ -10076,7 +10191,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -10103,7 +10218,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "futures 0.3.21",
  "log",
@@ -10116,7 +10231,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "futures 0.3.21",
  "futures-timer",
@@ -10128,9 +10243,9 @@ dependencies = [
 
 [[package]]
 name = "scale-info"
-version = "2.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0563970d79bcbf3c537ce3ad36d859b30d36fc5b190efd227f1f7a84d7cf0d42"
+checksum = "8980cafbe98a7ee7a9cc16b32ebce542c77883f512d83fbf2ddc8f6a85ea74c9"
 dependencies = [
  "bitvec",
  "cfg-if 1.0.0",
@@ -10142,9 +10257,9 @@ dependencies = [
 
 [[package]]
 name = "scale-info-derive"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7805950c36512db9e3251c970bb7ac425f326716941862205d612ab3b5e46e2"
+checksum = "4260c630e8a8a33429d1688eff2f163f24c65a4e1b1578ef6b565061336e4b6f"
 dependencies = [
  "proc-macro-crate 1.1.3",
  "proc-macro2",
@@ -10513,8 +10628,8 @@ checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
 
 [[package]]
 name = "slot-range-helper"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "enumn",
  "parity-scale-codec",
@@ -10613,7 +10728,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "hash-db",
  "log",
@@ -10630,7 +10745,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "blake2 0.10.4",
  "proc-macro-crate 1.1.3",
@@ -10642,7 +10757,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10655,7 +10770,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -10670,7 +10785,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10683,7 +10798,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -10695,7 +10810,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -10707,11 +10822,11 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "futures 0.3.21",
  "log",
- "lru 0.7.3",
+ "lru 0.7.5",
  "parity-scale-codec",
  "parking_lot 0.12.0",
  "sp-api",
@@ -10725,7 +10840,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -10744,7 +10859,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -10762,7 +10877,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "async-trait",
  "merlin",
@@ -10785,7 +10900,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10799,7 +10914,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -10811,7 +10926,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "base58",
  "bitflags",
@@ -10857,7 +10972,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "blake2 0.10.4",
  "byteorder",
@@ -10871,7 +10986,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10882,7 +10997,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.0",
@@ -10891,7 +11006,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10901,7 +11016,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -10912,7 +11027,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -10930,7 +11045,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -10944,7 +11059,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "futures 0.3.21",
  "hash-db",
@@ -10969,7 +11084,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -10980,7 +11095,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -10997,16 +11112,31 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "thiserror",
  "zstd",
 ]
 
+[[package]]
+name = "sp-mmr-primitives"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
+dependencies = [
+ "log",
+ "parity-scale-codec",
+ "serde",
+ "sp-api",
+ "sp-core",
+ "sp-debug-derive",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11020,7 +11150,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -11030,7 +11160,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -11040,7 +11170,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -11050,7 +11180,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -11072,7 +11202,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -11089,7 +11219,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.1.3",
@@ -11101,7 +11231,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "serde",
  "serde_json",
@@ -11110,7 +11240,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11124,7 +11254,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11135,7 +11265,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "hash-db",
  "log",
@@ -11157,12 +11287,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 
 [[package]]
 name = "sp-storage"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -11175,7 +11305,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "log",
  "sp-core",
@@ -11188,7 +11318,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "async-trait",
  "futures-timer",
@@ -11204,7 +11334,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -11216,7 +11346,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -11225,7 +11355,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "async-trait",
  "log",
@@ -11241,7 +11371,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -11257,7 +11387,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -11274,7 +11404,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -11285,7 +11415,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "impl-trait-for-tuples",
  "log",
@@ -11507,7 +11637,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "platforms",
 ]
@@ -11515,7 +11645,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.21",
@@ -11537,7 +11667,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "futures-util",
  "hyper",
@@ -11654,10 +11784,33 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "substrate-state-trie-migration-rpc"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
+dependencies = [
+ "jsonrpc-core",
+ "jsonrpc-core-client",
+ "jsonrpc-derive",
+ "log",
+ "parity-scale-codec",
+ "sc-client-api",
+ "sc-rpc-api",
+ "scale-info",
+ "serde",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-state-machine",
+ "sp-std",
+ "sp-trie",
+ "trie-db",
+]
+
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
@@ -11683,7 +11836,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "ansi_term 0.12.1",
  "build-helper",
@@ -11704,9 +11857,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "1.0.89"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea297be220d52398dcc07ce15a209fce436d361735ac1db700cab3b6cdfb9f54"
+checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -11763,11 +11916,22 @@ dependencies = [
  "cfg-if 1.0.0",
  "libc",
  "rand 0.8.5",
- "redox_syscall",
+ "redox_syscall 0.2.10",
  "remove_dir_all",
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "term"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
+dependencies = [
+ "byteorder",
+ "dirs",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.1.2"
@@ -11779,8 +11943,8 @@ dependencies = [
 
 [[package]]
 name = "test-runtime-constants"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -11824,6 +11988,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "thousands"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820"
+
 [[package]]
 name = "thread_local"
 version = "1.1.4"
@@ -12001,6 +12171,20 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-util"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764"
+dependencies = [
+ "bytes 1.1.0",
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "pin-project-lite 0.2.7",
+ "tokio",
+]
+
 [[package]]
 name = "toml"
 version = "0.5.8"
@@ -12018,9 +12202,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.32"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f"
+checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09"
 dependencies = [
  "cfg-if 1.0.0",
  "log",
@@ -12042,9 +12226,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.23"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa31669fa42c09c34d94d8165dd2012e8ff3c66aca50f3bb226b68f216f2706c"
+checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f"
 dependencies = [
  "lazy_static",
  "valuable",
@@ -12062,8 +12246,8 @@ dependencies = [
 
 [[package]]
 name = "tracing-gum"
-version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-primitives",
@@ -12073,8 +12257,8 @@ dependencies = [
 
 [[package]]
 name = "tracing-gum-proc-macro"
-version = "0.9.17"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "expander 0.0.6",
  "proc-macro-crate 1.1.3",
@@ -12201,10 +12385,10 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#666f39b8a22108f57732215de006518738034ba2"
+source = "git+https://github.com/paritytech//substrate?branch=sv-locked-for-gav-xcm-v3-and-bridges#1e0807fb477b21edd373eb88778336d5ff23d3a7"
 dependencies = [
  "clap 3.1.6",
- "jsonrpsee 0.4.1",
+ "jsonrpsee 0.10.1",
  "log",
  "parity-scale-codec",
  "remote-externalities",
@@ -12588,31 +12772,30 @@ dependencies = [
 
 [[package]]
 name = "wasmparser"
-version = "0.81.0"
+version = "0.83.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98930446519f63d00a836efdc22f67766ceae8dbcc1571379f2bcabc6b2b9abc"
+checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a"
 
 [[package]]
 name = "wasmtime"
-version = "0.33.0"
+version = "0.35.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414be1bc5ca12e755ffd3ff7acc3a6d1979922f8237fc34068b2156cebcc3270"
+checksum = "21ffb4705016d5ca91e18a72ed6822dab50e6d5ddd7045461b17ef19071cdef1"
 dependencies = [
  "anyhow",
  "backtrace",
  "bincode",
  "cfg-if 1.0.0",
- "cpp_demangle",
  "indexmap",
  "lazy_static",
  "libc",
  "log",
  "object",
+ "once_cell",
  "paste",
  "psm",
  "rayon",
  "region",
- "rustc-demangle",
  "serde",
  "target-lexicon",
  "wasmparser",
@@ -12626,9 +12809,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-cache"
-version = "0.33.0"
+version = "0.35.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9b4cd1949206fda9241faf8c460a7d797aa1692594d3dd6bc1cbfa57ee20d0"
+checksum = "85c6ab24291fa7cb3a181f5669f6c72599b7ef781669759b45c7828c5999d0c0"
 dependencies = [
  "anyhow",
  "base64",
@@ -12646,9 +12829,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-cranelift"
-version = "0.33.0"
+version = "0.35.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4693d33725773615a4c9957e4aa731af57b27dca579702d1d8ed5750760f1a9"
+checksum = "f04c810078a491b7bc4866ebe045f714d2b95e6b539e1f64009a4a7606be11de"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -12668,9 +12851,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-environ"
-version = "0.33.0"
+version = "0.35.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b17e47116a078b9770e6fb86cff8b9a660826623cebcfff251b047c8d8993ef"
+checksum = "61448266ea164b1ac406363cdcfac81c7c44db4d94c7a81c8620ac6c5c6cdf59"
 dependencies = [
  "anyhow",
  "cranelift-entity",
@@ -12688,38 +12871,52 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-jit"
-version = "0.33.0"
+version = "0.35.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60ea5b380bdf92e32911400375aeefb900ac9d3f8e350bb6ba555a39315f2ee7"
+checksum = "156b4623c6b0d4b8c24afb846c20525922f538ef464cc024abab7ea8de2109a2"
 dependencies = [
  "addr2line",
  "anyhow",
  "bincode",
  "cfg-if 1.0.0",
+ "cpp_demangle",
  "gimli",
+ "log",
  "object",
  "region",
+ "rustc-demangle",
  "rustix",
  "serde",
  "target-lexicon",
  "thiserror",
  "wasmtime-environ",
+ "wasmtime-jit-debug",
  "wasmtime-runtime",
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "wasmtime-jit-debug"
+version = "0.35.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5dc31f811760a6c76b2672c404866fd19b75e5fb3b0075a3e377a6846490654"
+dependencies = [
+ "lazy_static",
+ "object",
+ "rustix",
+]
+
 [[package]]
 name = "wasmtime-runtime"
-version = "0.33.0"
+version = "0.35.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abc7cd79937edd6e238b337608ebbcaf9c086a8457f01dfd598324f7fa56d81a"
+checksum = "f907beaff69d4d920fa4688411ee4cc75c0f01859e424677f9e426e2ef749864"
 dependencies = [
  "anyhow",
  "backtrace",
  "cc",
  "cfg-if 1.0.0",
  "indexmap",
- "lazy_static",
  "libc",
  "log",
  "mach",
@@ -12730,14 +12927,15 @@ dependencies = [
  "rustix",
  "thiserror",
  "wasmtime-environ",
+ "wasmtime-jit-debug",
  "winapi 0.3.9",
 ]
 
 [[package]]
 name = "wasmtime-types"
-version = "0.33.0"
+version = "0.35.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9e5e51a461a2cf2b69e1fc48f325b17d78a8582816e18479e8ead58844b23f8"
+checksum = "514ef0e5fd197b9609dc9eb74beba0c84d5a12b2417cbae55534633329ba4852"
 dependencies = [
  "cranelift-entity",
  "serde",
@@ -12946,24 +13144,27 @@ dependencies = [
 
 [[package]]
 name = "xcm"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "derivative",
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
  "scale-info",
+ "serde",
+ "sp-io",
  "xcm-procedural",
 ]
 
 [[package]]
 name = "xcm-builder"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "frame-support",
  "frame-system",
+ "impl-trait-for-tuples",
  "log",
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -12979,8 +13180,8 @@ dependencies = [
 
 [[package]]
 name = "xcm-executor"
-version = "0.9.18"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+version = "0.9.19"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -12997,7 +13198,7 @@ dependencies = [
 [[package]]
 name = "xcm-procedural"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#827792ca833396c82c726eda0bc2ad32ecddba73"
+source = "git+https://github.com/paritytech//polkadot?branch=gav-xcm-v3#ae53f58f9975a03c6d6b282e51b9d46f5a92f991"
 dependencies = [
  "Inflector",
  "proc-macro2",
@@ -13042,18 +13243,18 @@ dependencies = [
 
 [[package]]
 name = "zstd"
-version = "0.9.2+zstd.1.5.1"
+version = "0.10.0+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54"
+checksum = "3b1365becbe415f3f0fcd024e2f7b45bacfb5bdd055f0dc113571394114e7bdd"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "4.1.3+zstd.1.5.1"
+version = "4.1.4+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79"
+checksum = "2f7cd17c9af1a4d6c24beb1cc54b17e2ef7b593dc92f19e9d9acad8b182bbaee"
 dependencies = [
  "libc",
  "zstd-sys",
@@ -13061,9 +13262,9 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "1.6.2+zstd.1.5.1"
+version = "1.6.3+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f"
+checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8"
 dependencies = [
  "cc",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index 1090a0fe5b..424e88d544 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,3 +9,236 @@ members = [
 	"primitives/*",
 	"relays/*",
 ]
+
+# we need to be able to work with XCMv3, but it is not yet in Polkadot master
+# => manual patch is required. Because of https://github.com/rust-lang/cargo/issues/5478
+# we need to use double slash in the repo name.
+#
+# Once XCMv3 PR is merged, we may remove both Substrate and Polkadot patch section.
+
+[patch."https://github.com/paritytech/substrate"]
+beefy-gadget = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+beefy-gadget-rpc = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+beefy-merkle-tree = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+beefy-primitives = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+fork-tree = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+frame-benchmarking = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+frame-benchmarking-cli = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+frame-election-provider-solution-type = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+frame-election-provider-support = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+frame-executive = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+frame-support = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+frame-support-procedural = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+frame-system = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+frame-system-benchmarking = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+frame-try-runtime = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+node-inspect = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-aura = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-authorship = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-babe = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-bags-list = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-balances = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-beefy = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-beefy-mmr = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-bounties = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-child-bounties = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-collective = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-democracy = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-election-provider-multi-phase = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-gilt = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-grandpa = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-identity = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-im-online = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-indices = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-membership = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-mmr = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-mmr-rpc = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-multisig = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-nicks = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-offences = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-preimage = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-proxy = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-randomness-collective-flip = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-recovery = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-scheduler = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-session = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-society = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-staking = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-staking-reward-curve = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-staking-reward-fn = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-sudo = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-timestamp = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-tips = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-treasury = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-utility = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+pallet-vesting = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+remote-externalities = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-allocator = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-authority-discovery = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-basic-authorship = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-block-builder = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-chain-spec = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-chain-spec-derive = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-cli = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-client-api = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-client-db = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-consensus = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-consensus-aura = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-consensus-babe = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-consensus-babe-rpc = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-consensus-slots = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-consensus-uncles = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-executor = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-executor-common = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-executor-wasmtime = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-finality-grandpa = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-finality-grandpa-rpc = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-informant = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-keystore = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-network = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-network-gossip = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-offchain = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-peerset = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-proposer-metrics = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-rpc = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-rpc-api = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-rpc-server = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-service = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-state-db = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-sync-state-rpc = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-sysinfo = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-telemetry = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-tracing = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-tracing-proc-macro = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-transaction-pool = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-transaction-pool-api = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sc-utils = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-api = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-api-proc-macro = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-application-crypto = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-arithmetic = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-authority-discovery = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-authorship = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-block-builder = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-blockchain = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-consensus = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-consensus-aura = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-consensus-babe = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-consensus-slots = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-consensus-vrf = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-core = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-core-hashing = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-core-hashing-proc-macro = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-database = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-debug-derive = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-externalities = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-finality-grandpa = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-inherents = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-io = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-keyring = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-keystore = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-mmr-primitives = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-npos-elections = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-offchain = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-panic-handler = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-rpc = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-runtime = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-runtime-interface = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-serializer = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-session = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-staking = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-state-machine = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-std = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-storage = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-tasks = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-timestamp = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-tracing = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-transaction-pool = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-transaction-storage-proof = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-trie = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-version = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-version-proc-macro = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+sp-wasm-interface = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+substrate-build-script-utils = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+substrate-frame-rpc-system = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+substrate-test-client = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+try-runtime-cli = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+
+[patch."https://github.com/paritytech/polkadot"]
+kusama-runtime = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+kusama-runtime-constants = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+metered-channel = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+pallet-xcm = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-approval-distribution = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-availability-bitfield-distribution = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-availability-distribution = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-availability-recovery = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-cli = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-client = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-collator-protocol = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-dispute-distribution = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-erasure-coding = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-gossip-support = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-network-bridge = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-node-collation-generation = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-node-core-approval-voting = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-node-core-av-store = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-node-core-backing = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-node-core-bitfield-signing = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-node-core-candidate-validation = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-node-core-chain-api = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-node-core-chain-selection = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-node-core-dispute-coordinator = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-node-core-parachains-inherent = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-node-core-provisioner = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-node-core-pvf = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-node-core-pvf-checker = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-node-core-runtime-api = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-node-jaeger = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-node-metrics = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-node-network-protocol = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-node-primitives = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-node-subsystem = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-node-subsystem-types = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-node-subsystem-util = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-overseer = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-overseer-gen = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-overseer-gen-proc-macro = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-parachain = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-performance-test = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-primitives = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-rpc = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-runtime = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-runtime-common = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-runtime-constants = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-runtime-metrics = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-service = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-statement-distribution = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-statement-table = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-test-runtime = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+polkadot-test-service = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+slot-range-helper = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+test-runtime-constants = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+tracing-gum = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+tracing-gum-proc-macro = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+xcm = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+xcm-builder = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+xcm-executor = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
+xcm-procedural = { git = "https://github.com/paritytech//polkadot", branch = "gav-xcm-v3" }
diff --git a/bin/millau/node/src/cli.rs b/bin/millau/node/src/cli.rs
index c3c3d134e3..0280254bca 100644
--- a/bin/millau/node/src/cli.rs
+++ b/bin/millau/node/src/cli.rs
@@ -67,5 +67,6 @@ pub enum Subcommand {
 	Inspect(node_inspect::cli::InspectCmd),
 
 	/// Benchmark runtime pallets.
+	#[clap(subcommand)]
 	Benchmark(frame_benchmarking_cli::BenchmarkCmd),
 }
diff --git a/bin/millau/node/src/command.rs b/bin/millau/node/src/command.rs
index 3653428d10..e9f94b03a2 100644
--- a/bin/millau/node/src/command.rs
+++ b/bin/millau/node/src/command.rs
@@ -19,6 +19,7 @@ use crate::{
 	service,
 	service::new_partial,
 };
+use frame_benchmarking_cli::BenchmarkCmd;
 use millau_runtime::{Block, RuntimeApi};
 use sc_cli::{ChainSpec, RuntimeVersion, SubstrateCli};
 use sc_service::PartialComponents;
@@ -77,18 +78,23 @@ pub fn run() -> sc_cli::Result<()> {
 	));
 
 	match &cli.subcommand {
-		Some(Subcommand::Benchmark(cmd)) =>
-			if cfg!(feature = "runtime-benchmarks") {
-				let runner = cli.create_runner(cmd)?;
-
-				runner.sync_run(|config| cmd.run::<Block, service::ExecutorDispatch>(config))
-			} else {
-				println!(
-					"Benchmarking wasn't enabled when building the node. \
-				You can enable it with `--features runtime-benchmarks`."
-				);
-				Ok(())
-			},
+		Some(Subcommand::Benchmark(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			match cmd {
+				BenchmarkCmd::Pallet(cmd) =>
+					if cfg!(feature = "runtime-benchmarks") {
+						runner
+							.sync_run(|config| cmd.run::<Block, service::ExecutorDispatch>(config))
+					} else {
+						println!(
+							"Benchmarking wasn't enabled when building the node. \
+					You can enable it with `--features runtime-benchmarks`."
+						);
+						Ok(())
+					},
+				_ => Err("Unsupported benchmarking subcommand".into()),
+			}
+		},
 		Some(Subcommand::Key(cmd)) => cmd.run(&cli),
 		Some(Subcommand::Sign(cmd)) => cmd.run(),
 		Some(Subcommand::Verify(cmd)) => cmd.run(),
diff --git a/bin/millau/node/src/service.rs b/bin/millau/node/src/service.rs
index 15f88269aa..a86216ca63 100644
--- a/bin/millau/node/src/service.rs
+++ b/bin/millau/node/src/service.rs
@@ -392,8 +392,9 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		if role.is_authority() { Some(keystore_container.sync_keystore()) } else { None };
 
 	let beefy_params = beefy_gadget::BeefyParams {
-		client,
+		client: client.clone(),
 		backend,
+		runtime: client,
 		key_store: keystore.clone(),
 		network: network.clone(),
 		signed_commitment_sender: beefy_commitment_link,
@@ -407,7 +408,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 	task_manager.spawn_essential_handle().spawn_blocking(
 		"beefy-gadget",
 		None,
-		beefy_gadget::start_beefy_gadget::<_, _, _, _>(beefy_params),
+		beefy_gadget::start_beefy_gadget::<_, _, _, _, _>(beefy_params),
 	);
 
 	let grandpa_config = sc_finality_grandpa::Config {
diff --git a/bin/millau/runtime/Cargo.toml b/bin/millau/runtime/Cargo.toml
index 162404b77e..7fd2db7eee 100644
--- a/bin/millau/runtime/Cargo.toml
+++ b/bin/millau/runtime/Cargo.toml
@@ -11,7 +11,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 hex-literal = "0.3"
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 libsecp256k1 = { version = "0.7", optional = true, default-features = false, features = ["hmac"] }
-scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 serde = { version = "1.0", optional = true, features = ["derive"] }
 
 # Bridge dependencies
@@ -44,7 +44,6 @@ pallet-beefy = { git = "https://github.com/paritytech/substrate", branch = "mast
 pallet-beefy-mmr = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-mmr = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-mmr-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -57,6 +56,7 @@ sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch =
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-mmr-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
diff --git a/bin/millau/runtime/src/lib.rs b/bin/millau/runtime/src/lib.rs
index d2da5affb2..99bb8ae33c 100644
--- a/bin/millau/runtime/src/lib.rs
+++ b/bin/millau/runtime/src/lib.rs
@@ -39,13 +39,13 @@ use bridge_runtime_common::messages::{
 use pallet_grandpa::{
 	fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList,
 };
-use pallet_mmr_primitives::{
-	DataOrHash, EncodableOpaqueLeaf, Error as MmrError, LeafDataProvider, Proof as MmrProof,
-};
 use pallet_transaction_payment::{FeeDetails, Multiplier, RuntimeDispatchInfo};
 use sp_api::impl_runtime_apis;
 use sp_consensus_aura::sr25519::AuthorityId as AuraId;
 use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
+use sp_mmr_primitives::{
+	DataOrHash, EncodableOpaqueLeaf, Error as MmrError, LeafDataProvider, Proof as MmrProof,
+};
 use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
 	traits::{Block as BlockT, IdentityLookup, Keccak256, NumberFor, OpaqueKeys},
@@ -61,7 +61,10 @@ use sp_version::RuntimeVersion;
 pub use frame_support::{
 	construct_runtime, parameter_types,
 	traits::{Currency, ExistenceRequirement, Imbalance, KeyOwnerProofSystem},
-	weights::{constants::WEIGHT_PER_SECOND, DispatchClass, IdentityFee, RuntimeDbWeight, Weight},
+	weights::{
+		constants::WEIGHT_PER_SECOND, ConstantMultiplier, DispatchClass, IdentityFee,
+		RuntimeDbWeight, Weight,
+	},
 	StorageValue,
 };
 
@@ -278,10 +281,19 @@ parameter_types! {
 	pub LeafVersion: MmrLeafVersion = MmrLeafVersion::new(0, 0);
 }
 
+pub struct BeefyDummyDataProvider;
+
+impl beefy_primitives::mmr::BeefyDataProvider<()> for BeefyDummyDataProvider {
+	fn extra_data() -> () {
+		()
+	}
+}
+
 impl pallet_beefy_mmr::Config for Runtime {
 	type LeafVersion = LeafVersion;
 	type BeefyAuthorityToMerkleLeaf = pallet_beefy_mmr::BeefyEcdsaToEthereum;
-	type ParachainHeads = ();
+	type LeafExtra = ();
+	type BeefyDataProvider = BeefyDummyDataProvider;
 }
 
 parameter_types! {
@@ -333,9 +345,9 @@ parameter_types! {
 
 impl pallet_transaction_payment::Config for Runtime {
 	type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, ()>;
-	type TransactionByteFee = TransactionByteFee;
 	type OperationalFeeMultiplier = OperationalFeeMultiplier;
 	type WeightToFee = bp_millau::WeightToFee;
+	type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;
 	type FeeMultiplierUpdate = pallet_transaction_payment::TargetedFeeAdjustment<
 		Runtime,
 		TargetBlockFullness,
@@ -669,7 +681,7 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl pallet_mmr_primitives::MmrApi<Block, MmrHash> for Runtime {
+	impl sp_mmr_primitives::MmrApi<Block, MmrHash> for Runtime {
 		fn generate_proof(leaf_index: u64)
 			-> Result<(EncodableOpaqueLeaf, MmrProof<MmrHash>), MmrError>
 		{
@@ -700,6 +712,10 @@ impl_runtime_apis! {
 			let node = DataOrHash::Data(leaf.into_opaque_leaf());
 			pallet_mmr::verify_leaf_proof::<MmrHashing, _>(root, node, proof)
 		}
+
+		fn mmr_root() -> Result<MmrHash, MmrError> {
+			Ok(Mmr::mmr_root())
+		}
 	}
 
 	impl fg_primitives::GrandpaApi<Block> for Runtime {
diff --git a/bin/rialto-parachain/node/Cargo.toml b/bin/rialto-parachain/node/Cargo.toml
index 41021a35ed..7f5e6dedb6 100644
--- a/bin/rialto-parachain/node/Cargo.toml
+++ b/bin/rialto-parachain/node/Cargo.toml
@@ -72,20 +72,20 @@ sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "mast
 sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 # Cumulus dependencies
-cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "master" }
-cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "master" }
-cumulus-client-collator = { git = "https://github.com/paritytech/cumulus", branch = "master" }
-cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "master" }
-cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "master" }
-cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "master" }
-cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "master" }
-cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "master" }
-cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "master" }
-cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "master" }
+cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "gav-xcm-v3" }
+cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "gav-xcm-v3" }
+cumulus-client-collator = { git = "https://github.com/paritytech/cumulus", branch = "gav-xcm-v3" }
+cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "gav-xcm-v3" }
+cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "gav-xcm-v3" }
+cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "gav-xcm-v3" }
+cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "gav-xcm-v3" }
+cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "gav-xcm-v3" }
+cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "gav-xcm-v3" }
+cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "gav-xcm-v3" }
 
 # Polkadot dependencies
-polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
\ No newline at end of file
+polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3" }
+polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3" }
+polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3" }
diff --git a/bin/rialto-parachain/node/src/cli.rs b/bin/rialto-parachain/node/src/cli.rs
index 89d049f022..daf6739daa 100644
--- a/bin/rialto-parachain/node/src/cli.rs
+++ b/bin/rialto-parachain/node/src/cli.rs
@@ -51,7 +51,7 @@ pub enum Subcommand {
 	Revert(sc_cli::RevertCmd),
 
 	/// The custom benchmark subcommmand benchmarking runtime pallets.
-	#[clap(name = "benchmark", about = "Benchmark runtime pallets.")]
+	#[clap(subcommand)]
 	Benchmark(frame_benchmarking_cli::BenchmarkCmd),
 }
 
diff --git a/bin/rialto-parachain/node/src/command.rs b/bin/rialto-parachain/node/src/command.rs
index f93a939b9e..20278b5767 100644
--- a/bin/rialto-parachain/node/src/command.rs
+++ b/bin/rialto-parachain/node/src/command.rs
@@ -22,6 +22,7 @@ use crate::{
 use codec::Encode;
 use cumulus_client_service::genesis::generate_genesis_block;
 use cumulus_primitives_core::ParaId;
+use frame_benchmarking_cli::BenchmarkCmd;
 use log::info;
 use polkadot_parachain::primitives::AccountIdConversion;
 use rialto_parachain_runtime::{Block, RuntimeApi};
@@ -255,16 +256,22 @@ pub fn run() -> Result<()> {
 
 			Ok(())
 		},
-		Some(Subcommand::Benchmark(cmd)) =>
-			if cfg!(feature = "runtime-benchmarks") {
-				let runner = cli.create_runner(cmd)?;
-
-				runner.sync_run(|config| cmd.run::<Block, ParachainRuntimeExecutor>(config))
-			} else {
-				Err("Benchmarking wasn't enabled when building the node. \
-				You can enable it with `--features runtime-benchmarks`."
-					.into())
-			},
+		Some(Subcommand::Benchmark(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			match cmd {
+				BenchmarkCmd::Pallet(cmd) =>
+					if cfg!(feature = "runtime-benchmarks") {
+						runner.sync_run(|config| cmd.run::<Block, ParachainRuntimeExecutor>(config))
+					} else {
+						println!(
+							"Benchmarking wasn't enabled when building the node. \
+					You can enable it with `--features runtime-benchmarks`."
+						);
+						Ok(())
+					},
+				_ => Err("Unsupported benchmarking subcommand".into()),
+			}
+		},
 		None => {
 			let runner = cli.create_runner(&cli.run.normalize())?;
 			let collator_options = cli.run.collator_options();
diff --git a/bin/rialto-parachain/runtime/Cargo.toml b/bin/rialto-parachain/runtime/Cargo.toml
index 1d0870fcbc..52a54bd7bb 100644
--- a/bin/rialto-parachain/runtime/Cargo.toml
+++ b/bin/rialto-parachain/runtime/Cargo.toml
@@ -13,7 +13,7 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", bran
 [dependencies]
 codec = { package = 'parity-scale-codec', version = '3.0.0', default-features = false, features = ['derive']}
 log = { version = "0.4.14", default-features = false }
-scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 serde = { version = '1.0', optional = true, features = ['derive'] }
 
 # Bridge depedencies
@@ -38,7 +38,7 @@ sp-version = { git = "https://github.com/paritytech/substrate", branch = "master
 ## Substrate FRAME Dependencies
 frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
 frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -53,22 +53,22 @@ pallet-transaction-payment = { git = "https://github.com/paritytech/substrate",
 pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 
 # Cumulus Dependencies
-cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "master", default-features = false }
-cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "master", default-features = false }
-cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "master", default-features = false }
-cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "master", default-features = false }
-cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "master", default-features = false }
-cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "master", default-features = false }
-cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "master", default-features = false }
-cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "master", default-features = false }
-parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "master", default-features = false }
+cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "gav-xcm-v3", default-features = false }
+cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "gav-xcm-v3", default-features = false }
+cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "gav-xcm-v3", default-features = false }
+cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "gav-xcm-v3", default-features = false }
+cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "gav-xcm-v3", default-features = false }
+cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "gav-xcm-v3", default-features = false }
+cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "gav-xcm-v3", default-features = false }
+cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "gav-xcm-v3", default-features = false }
+parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "gav-xcm-v3", default-features = false }
 
 # Polkadot Dependencies
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false }
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false }
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3", default-features = false }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3", default-features = false }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3", default-features = false }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3", default-features = false }
 
 [features]
 default = ['std']
@@ -106,7 +106,9 @@ std = [
 	"pallet-timestamp/std",
 	"pallet-sudo/std",
 	"pallet-transaction-payment/std",
+	"pallet-xcm/std",
 	"parachain-info/std",
+	"polkadot-parachain/std",
 	"cumulus-pallet-aura-ext/std",
 	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-xcmp-queue/std",
diff --git a/bin/rialto-parachain/runtime/src/lib.rs b/bin/rialto-parachain/runtime/src/lib.rs
index 646521f329..41f159c70d 100644
--- a/bin/rialto-parachain/runtime/src/lib.rs
+++ b/bin/rialto-parachain/runtime/src/lib.rs
@@ -43,7 +43,7 @@ use sp_version::RuntimeVersion;
 // A few exports that help ease life for downstream crates.
 pub use frame_support::{
 	construct_runtime, match_types, parameter_types,
-	traits::{Everything, IsInVec, Randomness},
+	traits::{Everything, IsInVec, Nothing, Randomness},
 	weights::{
 		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
 		DispatchClass, IdentityFee, Weight,
@@ -69,10 +69,10 @@ use polkadot_parachain::primitives::Sibling;
 use xcm::latest::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter,
-	EnsureXcmOrigin, FixedWeightBounds, IsConcrete, LocationInverter, NativeAsset,
-	ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
-	SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
-	SovereignSignedViaLocation, TakeWeightCredit, UsingComponents,
+	EnsureXcmOrigin, FixedWeightBounds, IsConcrete, NativeAsset, ParentAsSuperuser, ParentIsPreset,
+	RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
+	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
+	UsingComponents,
 };
 use xcm_executor::{Config, XcmExecutor};
 
@@ -252,9 +252,9 @@ impl pallet_balances::Config for Runtime {
 
 impl pallet_transaction_payment::Config for Runtime {
 	type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, ()>;
-	type TransactionByteFee = TransactionByteFee;
 	type OperationalFeeMultiplier = OperationalFeeMultiplier;
 	type WeightToFee = IdentityFee<Balance>;
+	type LengthToFee = IdentityFee<Balance>;
 	type FeeMultiplierUpdate = ();
 }
 
@@ -289,7 +289,7 @@ parameter_types! {
 	pub const RelayLocation: MultiLocation = MultiLocation::parent();
 	pub const RelayNetwork: NetworkId = NetworkId::Polkadot;
 	pub RelayOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();
-	pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();
+	pub UniversalLocation: InteriorMultiLocation = X1(Parachain(ParachainInfo::parachain_id().into()).into());
 }
 
 /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
@@ -349,6 +349,7 @@ parameter_types! {
 	pub const WeightPrice: (MultiLocation, u128) = (MultiLocation::parent(), UNIT);
 	pub const MaxInstructions: u32 = 100;
 	pub const MaxAuthorities: u32 = 100_000;
+	pub MaxAssetsIntoHolding: u32 = 64;
 }
 
 match_types! {
@@ -369,12 +370,11 @@ pub struct XcmConfig;
 impl Config for XcmConfig {
 	type Call = Call;
 	type XcmSender = XcmRouter;
-	// How to withdraw and deposit an asset.
 	type AssetTransactor = LocalAssetTransactor;
 	type OriginConverter = XcmOriginToTransactDispatchOrigin;
 	type IsReserve = NativeAsset;
 	type IsTeleporter = NativeAsset; // <- should be enough to allow teleportation of UNIT
-	type LocationInverter = LocationInverter<Ancestry>;
+	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
 	type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;
 	type Trader = UsingComponents<IdentityFee<Balance>, RelayLocation, AccountId, Balances, ()>;
@@ -382,6 +382,13 @@ impl Config for XcmConfig {
 	type AssetTrap = PolkadotXcm;
 	type AssetClaims = PolkadotXcm;
 	type SubscriptionService = PolkadotXcm;
+	type PalletInstancesInfo = ();
+	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
+	type AssetLocker = ();
+	type AssetExchanger = ();
+	type FeeManager = ();
+	type MessageExporter = ();
+	type UniversalAliases = Nothing;
 }
 
 /// No local origins on this chain are allowed to dispatch XCM sends/executions.
@@ -391,7 +398,7 @@ pub type LocalOriginToLocation = SignedToAccountId32<Origin, AccountId, RelayNet
 /// queues.
 pub type XcmRouter = (
 	// Two routers - use UMP to communicate with the relay chain:
-	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, ()>,
+	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, (), ()>,
 	// ..and XCMP to communicate with the sibling chains.
 	XcmpQueue,
 );
@@ -406,11 +413,16 @@ impl pallet_xcm::Config for Runtime {
 	type XcmTeleportFilter = Everything;
 	type XcmReserveTransferFilter = Everything;
 	type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;
-	type LocationInverter = LocationInverter<Ancestry>;
 	type Origin = Origin;
 	type Call = Call;
 	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
 	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
+	type Currency = Balances;
+	type CurrencyMatcher = ();
+	type TrustedLockers = ();
+	type SovereignAccountOf = ();
+	type MaxLockers = frame_support::traits::ConstU32<8>;
+	type UniversalLocation = UniversalLocation;
 }
 
 impl cumulus_pallet_xcm::Config for Runtime {
@@ -427,6 +439,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type ControllerOrigin = EnsureRoot<AccountId>;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
 	type WeightInfo = ();
+	type PriceForSiblingDelivery = ();
 }
 
 impl cumulus_pallet_dmp_queue::Config for Runtime {
diff --git a/bin/rialto/node/Cargo.toml b/bin/rialto/node/Cargo.toml
index 31699ffad0..6ae7eba231 100644
--- a/bin/rialto/node/Cargo.toml
+++ b/bin/rialto/node/Cargo.toml
@@ -35,7 +35,6 @@ frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch =
 frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
 frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
 node-inspect = { git = "https://github.com/paritytech/substrate", branch = "master" }
-pallet-mmr-primitives = { git = "https://github.com/paritytech/substrate", branch = "master" }
 pallet-mmr-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
 pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
 pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -66,6 +65,7 @@ sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch =
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-mmr-primitives = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -76,10 +76,10 @@ substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate
 
 # Polkadot Dependencies
 
-polkadot-node-core-pvf = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false, features = [ "full-node", "polkadot-native" ] }
+polkadot-node-core-pvf = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3" }
+polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3" }
+polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3", default-features = false, features = [ "full-node", "polkadot-native" ] }
 
 [build-dependencies]
 substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/bin/rialto/node/src/cli.rs b/bin/rialto/node/src/cli.rs
index bb7f54998d..0cdd25417e 100644
--- a/bin/rialto/node/src/cli.rs
+++ b/bin/rialto/node/src/cli.rs
@@ -67,6 +67,7 @@ pub enum Subcommand {
 	Inspect(node_inspect::cli::InspectCmd),
 
 	/// Benchmark runtime pallets.
+	#[clap(subcommand)]
 	Benchmark(frame_benchmarking_cli::BenchmarkCmd),
 
 	/// FOR INTERNAL USE: analog of the "prepare-worker" command of the polkadot binary.
diff --git a/bin/rialto/node/src/command.rs b/bin/rialto/node/src/command.rs
index 24e73f6fff..385a88ca06 100644
--- a/bin/rialto/node/src/command.rs
+++ b/bin/rialto/node/src/command.rs
@@ -15,6 +15,7 @@
 // along with Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
 
 use crate::cli::{Cli, Subcommand};
+use frame_benchmarking_cli::BenchmarkCmd;
 use rialto_runtime::{Block, RuntimeApi};
 use sc_cli::{ChainSpec, Role, RuntimeVersion, SubstrateCli};
 
@@ -86,18 +87,22 @@ pub fn run() -> sc_cli::Result<()> {
 	));
 
 	match &cli.subcommand {
-		Some(Subcommand::Benchmark(cmd)) =>
-			if cfg!(feature = "runtime-benchmarks") {
-				let runner = cli.create_runner(cmd)?;
-
-				runner.sync_run(|config| cmd.run::<Block, ExecutorDispatch>(config))
-			} else {
-				println!(
-					"Benchmarking wasn't enabled when building the node. \
-				You can enable it with `--features runtime-benchmarks`."
-				);
-				Ok(())
-			},
+		Some(Subcommand::Benchmark(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			match cmd {
+				BenchmarkCmd::Pallet(cmd) =>
+					if cfg!(feature = "runtime-benchmarks") {
+						runner.sync_run(|config| cmd.run::<Block, ExecutorDispatch>(config))
+					} else {
+						println!(
+							"Benchmarking wasn't enabled when building the node. \
+					You can enable it with `--features runtime-benchmarks`."
+						);
+						Ok(())
+					},
+				_ => Err("Unsupported benchmarking subcommand".into()),
+			}
+		},
 		Some(Subcommand::Key(cmd)) => cmd.run(&cli),
 		Some(Subcommand::Sign(cmd)) => cmd.run(),
 		Some(Subcommand::Verify(cmd)) => cmd.run(),
diff --git a/bin/rialto/runtime/Cargo.toml b/bin/rialto/runtime/Cargo.toml
index 59b9a8e9b5..99ab1f9a69 100644
--- a/bin/rialto/runtime/Cargo.toml
+++ b/bin/rialto/runtime/Cargo.toml
@@ -12,7 +12,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 hex-literal = "0.3"
 libsecp256k1 = { version = "0.7", optional = true, default-features = false, features = ["hmac"] }
 log = { version = "0.4.14", default-features = false }
-scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 serde = { version = "1.0", optional = true, features = ["derive"] }
 
 # Bridge dependencies
@@ -44,7 +44,6 @@ pallet-beefy = { git = "https://github.com/paritytech/substrate", branch = "mast
 pallet-beefy-mmr = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-mmr = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-mmr-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -58,6 +57,7 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master",
 sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-mmr-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -68,9 +68,9 @@ sp-version = { git = "https://github.com/paritytech/substrate", branch = "master
 
 # Polkadot (parachain) Dependencies
 
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false }
-polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false }
-polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3", default-features = false }
+polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3", default-features = false }
+polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3", default-features = false }
 
 [dev-dependencies]
 bridge-runtime-common = { path = "../../runtime-common", features = ["integrity-test"] }
@@ -108,7 +108,7 @@ std = [
 	"pallet-bridge-messages/std",
 	"pallet-grandpa/std",
 	"pallet-mmr/std",
-	"pallet-mmr-primitives/std",
+	"sp-mmr-primitives/std",
 	"pallet-shift-session-manager/std",
 	"pallet-sudo/std",
 	"pallet-timestamp/std",
diff --git a/bin/rialto/runtime/src/lib.rs b/bin/rialto/runtime/src/lib.rs
index 87cddf5e26..2334d45f34 100644
--- a/bin/rialto/runtime/src/lib.rs
+++ b/bin/rialto/runtime/src/lib.rs
@@ -40,13 +40,13 @@ use bridge_runtime_common::messages::{
 use pallet_grandpa::{
 	fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList,
 };
-use pallet_mmr_primitives::{
-	DataOrHash, EncodableOpaqueLeaf, Error as MmrError, LeafDataProvider, Proof as MmrProof,
-};
 use pallet_transaction_payment::{FeeDetails, Multiplier, RuntimeDispatchInfo};
 use sp_api::impl_runtime_apis;
 use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
 use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
+use sp_mmr_primitives::{
+	DataOrHash, EncodableOpaqueLeaf, Error as MmrError, LeafDataProvider, Proof as MmrProof,
+};
 use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
 	traits::{AccountIdLookup, Block as BlockT, Keccak256, NumberFor, OpaqueKeys},
@@ -305,10 +305,19 @@ parameter_types! {
 	pub LeafVersion: MmrLeafVersion = MmrLeafVersion::new(0, 0);
 }
 
+pub struct BeefyDummyDataProvider;
+
+impl beefy_primitives::mmr::BeefyDataProvider<()> for BeefyDummyDataProvider {
+	fn extra_data() -> () {
+		()
+	}
+}
+
 impl pallet_beefy_mmr::Config for Runtime {
 	type LeafVersion = LeafVersion;
 	type BeefyAuthorityToMerkleLeaf = pallet_beefy_mmr::BeefyEcdsaToEthereum;
-	type ParachainHeads = ();
+	type LeafExtra = ();
+	type BeefyDataProvider = BeefyDummyDataProvider;
 }
 
 parameter_types! {
@@ -360,9 +369,9 @@ parameter_types! {
 
 impl pallet_transaction_payment::Config for Runtime {
 	type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, ()>;
-	type TransactionByteFee = TransactionByteFee;
 	type OperationalFeeMultiplier = OperationalFeeMultiplier;
 	type WeightToFee = bp_rialto::WeightToFee;
+	type LengthToFee = bp_rialto::WeightToFee;
 	type FeeMultiplierUpdate = pallet_transaction_payment::TargetedFeeAdjustment<
 		Runtime,
 		TargetBlockFullness,
@@ -610,7 +619,7 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl pallet_mmr_primitives::MmrApi<Block, Hash> for Runtime {
+	impl sp_mmr_primitives::MmrApi<Block, Hash> for Runtime {
 		fn generate_proof(leaf_index: u64)
 			-> Result<(EncodableOpaqueLeaf, MmrProof<Hash>), MmrError>
 		{
@@ -641,6 +650,10 @@ impl_runtime_apis! {
 			let node = DataOrHash::Data(leaf.into_opaque_leaf());
 			pallet_mmr::verify_leaf_proof::<MmrHashing, _>(root, node, proof)
 		}
+
+		fn mmr_root() -> Result<Hash, MmrError> {
+			Ok(Mmr::mmr_root())
+		}
 	}
 
 	impl bp_millau::MillauFinalityApi<Block> for Runtime {
@@ -715,7 +728,7 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl polkadot_primitives::v2::ParachainHost<Block, Hash, BlockNumber> for Runtime {
+	impl polkadot_primitives::runtime_api::ParachainHost<Block, Hash, BlockNumber> for Runtime {
 		fn validators() -> Vec<polkadot_primitives::v2::ValidatorId> {
 			polkadot_runtime_parachains::runtime_api_impl::v2::validators::<Runtime>()
 		}
@@ -809,6 +822,10 @@ impl_runtime_apis! {
 		{
 			polkadot_runtime_parachains::runtime_api_impl::v2::validation_code_hash::<Runtime>(para_id, assumption)
 		}
+
+		fn staging_get_disputes() -> Vec<(polkadot_primitives::v2::SessionIndex, polkadot_primitives::v2::CandidateHash, polkadot_primitives::v2::DisputeState<BlockNumber>)> {
+			unimplemented!()
+		}
 	}
 
 	impl sp_authority_discovery::AuthorityDiscoveryApi<Block> for Runtime {
diff --git a/bin/runtime-common/Cargo.toml b/bin/runtime-common/Cargo.toml
index abd84364ce..6ca7de5ac4 100644
--- a/bin/runtime-common/Cargo.toml
+++ b/bin/runtime-common/Cargo.toml
@@ -11,7 +11,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 ed25519-dalek = { version = "1.0", default-features = false, optional = true }
 hash-db = { version = "0.15.2", default-features = false }
-scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 static_assertions = { version = "1.1", optional = true }
 
 # Bridge dependencies
diff --git a/modules/dispatch/Cargo.toml b/modules/dispatch/Cargo.toml
index 833d5cca77..c2e8c74da8 100644
--- a/modules/dispatch/Cargo.toml
+++ b/modules/dispatch/Cargo.toml
@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
 log = { version = "0.4.14", default-features = false }
-scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 
 # Bridge dependencies
 
diff --git a/modules/grandpa/Cargo.toml b/modules/grandpa/Cargo.toml
index eac80375da..f4a64758aa 100644
--- a/modules/grandpa/Cargo.toml
+++ b/modules/grandpa/Cargo.toml
@@ -12,7 +12,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 finality-grandpa = { version = "0.15.0", default-features = false }
 log = { version = "0.4.14", default-features = false }
 num-traits = { version = "0.2", default-features = false }
-scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 serde = { version = "1.0", optional = true }
 
 # Bridge Dependencies
diff --git a/modules/messages/Cargo.toml b/modules/messages/Cargo.toml
index 804f323f10..eaacf2aeb4 100644
--- a/modules/messages/Cargo.toml
+++ b/modules/messages/Cargo.toml
@@ -11,7 +11,7 @@ bitvec = { version = "1", default-features = false, features = ["alloc"] }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
 log = { version = "0.4.14", default-features = false }
 num-traits = { version = "0.2", default-features = false }
-scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 
 # Bridge dependencies
diff --git a/modules/shift-session-manager/Cargo.toml b/modules/shift-session-manager/Cargo.toml
index 30a5618b11..bf73651663 100644
--- a/modules/shift-session-manager/Cargo.toml
+++ b/modules/shift-session-manager/Cargo.toml
@@ -8,7 +8,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 
 # Substrate Dependencies
 
diff --git a/modules/token-swap/Cargo.toml b/modules/token-swap/Cargo.toml
index aad395fb7a..d3a60d3472 100644
--- a/modules/token-swap/Cargo.toml
+++ b/modules/token-swap/Cargo.toml
@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
 log = { version = "0.4.14", default-features = false }
-scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 serde = { version = "1.0", optional = true }
 
 # Bridge dependencies
diff --git a/modules/token-swap/src/lib.rs b/modules/token-swap/src/lib.rs
index e46a4bc2dd..81059ee1fd 100644
--- a/modules/token-swap/src/lib.rs
+++ b/modules/token-swap/src/lib.rs
@@ -301,110 +301,112 @@ pub mod pallet {
 			}
 
 			let swap_account = swap_account_id::<T, I>(&swap);
-			let actual_send_message_weight = frame_support::storage::with_transaction(|| {
-				// funds are transferred from This account to the temporary Swap account
-				let transfer_result = T::ThisCurrency::transfer(
-					&swap.source_account_at_this_chain,
-					&swap_account,
-					// saturating_add is ok, or we have the chain where single holder owns all
-					// tokens
-					swap.source_balance_at_this_chain
-						.saturating_add(swap_delivery_and_dispatch_fee),
-					// if we'll allow account to die, then he'll be unable to `cancel_claim`
-					// if something won't work
-					ExistenceRequirement::KeepAlive,
-				);
-				if let Err(err) = transfer_result {
-					log::error!(
-						target: "runtime::bridge-token-swap",
-						"Failed to transfer This chain tokens for the swap {:?} to Swap account ({:?}): {:?}",
-						swap,
-						swap_account,
-						err,
+			let actual_send_message_weight = frame_support::storage::with_transaction(
+				|| -> sp_runtime::TransactionOutcome<Result<_, sp_runtime::DispatchError>> {
+					// funds are transferred from This account to the temporary Swap account
+					let transfer_result = T::ThisCurrency::transfer(
+						&swap.source_account_at_this_chain,
+						&swap_account,
+						// saturating_add is ok, or we have the chain where single holder owns all
+						// tokens
+						swap.source_balance_at_this_chain
+							.saturating_add(swap_delivery_and_dispatch_fee),
+						// if we'll allow account to die, then he'll be unable to `cancel_claim`
+						// if something won't work
+						ExistenceRequirement::KeepAlive,
 					);
-
-					return sp_runtime::TransactionOutcome::Rollback(Err(
-						Error::<T, I>::FailedToTransferToSwapAccount,
-					))
-				}
-
-				// the transfer message is sent over the bridge. The message is supposed to be a
-				// `Currency::transfer` call on the bridged chain, but no checks are made - it is
-				// the transaction submitter to ensure it is valid.
-				let send_message_result = T::MessagesBridge::send_message(
-					RawOrigin::TokenSwap {
-						source_account_at_this_chain: swap.source_account_at_this_chain.clone(),
-						swap_account_at_this_chain: swap_account.clone(),
-					}
-					.into(),
-					T::OutboundMessageLaneId::get(),
-					bp_message_dispatch::MessagePayload {
-						spec_version: bridged_chain_spec_version,
-						weight: bridged_currency_transfer_weight,
-						origin: bp_message_dispatch::CallOrigin::TargetAccount(
-							swap_account,
-							target_public_at_bridged_chain,
-							bridged_currency_transfer_signature,
-						),
-						dispatch_fee_payment: DispatchFeePayment::AtTargetChain,
-						call: bridged_currency_transfer,
-					},
-					swap_delivery_and_dispatch_fee,
-				);
-				let sent_message = match send_message_result {
-					Ok(sent_message) => sent_message,
-					Err(err) => {
+					if let Err(err) = transfer_result {
 						log::error!(
 							target: "runtime::bridge-token-swap",
-							"Failed to send token transfer message for swap {:?} to the Bridged chain: {:?}",
+							"Failed to transfer This chain tokens for the swap {:?} to Swap account ({:?}): {:?}",
 							swap,
+							swap_account,
 							err,
 						);
 
 						return sp_runtime::TransactionOutcome::Rollback(Err(
-							Error::<T, I>::FailedToSendTransferMessage,
+							Error::<T, I>::FailedToTransferToSwapAccount.into(),
 						))
-					},
-				};
-
-				// remember that we have started the swap
-				let swap_hash = swap.using_encoded(blake2_256).into();
-				let insert_swap_result =
-					PendingSwaps::<T, I>::try_mutate(swap_hash, |maybe_state| {
-						if maybe_state.is_some() {
-							return Err(())
+					}
+
+					// the transfer message is sent over the bridge. The message is supposed to be a
+					// `Currency::transfer` call on the bridged chain, but no checks are made - it
+					// is the transaction submitter to ensure it is valid.
+					let send_message_result = T::MessagesBridge::send_message(
+						RawOrigin::TokenSwap {
+							source_account_at_this_chain: swap.source_account_at_this_chain.clone(),
+							swap_account_at_this_chain: swap_account.clone(),
 						}
+						.into(),
+						T::OutboundMessageLaneId::get(),
+						bp_message_dispatch::MessagePayload {
+							spec_version: bridged_chain_spec_version,
+							weight: bridged_currency_transfer_weight,
+							origin: bp_message_dispatch::CallOrigin::TargetAccount(
+								swap_account,
+								target_public_at_bridged_chain,
+								bridged_currency_transfer_signature,
+							),
+							dispatch_fee_payment: DispatchFeePayment::AtTargetChain,
+							call: bridged_currency_transfer,
+						},
+						swap_delivery_and_dispatch_fee,
+					);
+					let sent_message = match send_message_result {
+						Ok(sent_message) => sent_message,
+						Err(err) => {
+							log::error!(
+								target: "runtime::bridge-token-swap",
+								"Failed to send token transfer message for swap {:?} to the Bridged chain: {:?}",
+								swap,
+								err,
+							);
+
+							return sp_runtime::TransactionOutcome::Rollback(Err(
+								Error::<T, I>::FailedToSendTransferMessage.into(),
+							))
+						},
+					};
 
-						*maybe_state = Some(TokenSwapState::Started);
-						Ok(())
-					});
-				if insert_swap_result.is_err() {
-					log::error!(
+					// remember that we have started the swap
+					let swap_hash = swap.using_encoded(blake2_256).into();
+					let insert_swap_result =
+						PendingSwaps::<T, I>::try_mutate(swap_hash, |maybe_state| {
+							if maybe_state.is_some() {
+								return Err(())
+							}
+
+							*maybe_state = Some(TokenSwapState::Started);
+							Ok(())
+						});
+					if insert_swap_result.is_err() {
+						log::error!(
+							target: "runtime::bridge-token-swap",
+							"Failed to start token swap {:?}: the swap is already started",
+							swap,
+						);
+
+						return sp_runtime::TransactionOutcome::Rollback(Err(
+							Error::<T, I>::SwapAlreadyStarted.into(),
+						))
+					}
+
+					log::trace!(
 						target: "runtime::bridge-token-swap",
-						"Failed to start token swap {:?}: the swap is already started",
+						"The swap {:?} (hash {:?}) has been started",
 						swap,
+						swap_hash,
 					);
 
-					return sp_runtime::TransactionOutcome::Rollback(Err(
-						Error::<T, I>::SwapAlreadyStarted,
-					))
-				}
-
-				log::trace!(
-					target: "runtime::bridge-token-swap",
-					"The swap {:?} (hash {:?}) has been started",
-					swap,
-					swap_hash,
-				);
-
-				// remember that we're waiting for the transfer message delivery confirmation
-				PendingMessages::<T, I>::insert(sent_message.nonce, swap_hash);
+					// remember that we're waiting for the transfer message delivery confirmation
+					PendingMessages::<T, I>::insert(sent_message.nonce, swap_hash);
 
-				// finally - emit the event
-				Self::deposit_event(Event::SwapStarted(swap_hash, sent_message.nonce));
+					// finally - emit the event
+					Self::deposit_event(Event::SwapStarted(swap_hash, sent_message.nonce));
 
-				sp_runtime::TransactionOutcome::Commit(Ok(sent_message.weight))
-			})?;
+					sp_runtime::TransactionOutcome::Commit(Ok(sent_message.weight))
+				},
+			)?;
 
 			Ok(PostDispatchInfo {
 				actual_weight: Some(base_weight.saturating_add(actual_send_message_weight)),
@@ -617,49 +619,51 @@ pub mod pallet {
 		event: Event<T, I>,
 	) -> DispatchResultWithPostInfo {
 		let swap_account = swap_account_id::<T, I>(&swap);
-		frame_support::storage::with_transaction(|| {
-			// funds are transferred from the temporary Swap account to the destination account
-			let transfer_result = T::ThisCurrency::transfer(
-				&swap_account,
-				&destination_account,
-				swap.source_balance_at_this_chain,
-				ExistenceRequirement::AllowDeath,
-			);
-			if let Err(err) = transfer_result {
-				log::error!(
-					target: "runtime::bridge-token-swap",
-					"Failed to transfer This chain tokens for the swap {:?} from the Swap account {:?} to {:?}: {:?}",
-					swap,
-					swap_account,
-					destination_account,
-					err,
+		frame_support::storage::with_transaction(
+			|| -> sp_runtime::TransactionOutcome<Result<_, sp_runtime::DispatchError>> {
+				// funds are transferred from the temporary Swap account to the destination account
+				let transfer_result = T::ThisCurrency::transfer(
+					&swap_account,
+					&destination_account,
+					swap.source_balance_at_this_chain,
+					ExistenceRequirement::AllowDeath,
 				);
+				if let Err(err) = transfer_result {
+					log::error!(
+						target: "runtime::bridge-token-swap",
+						"Failed to transfer This chain tokens for the swap {:?} from the Swap account {:?} to {:?}: {:?}",
+						swap,
+						swap_account,
+						destination_account,
+						err,
+					);
 
-				return sp_runtime::TransactionOutcome::Rollback(Err(
-					Error::<T, I>::FailedToTransferFromSwapAccount.into(),
-				))
-			}
+					return sp_runtime::TransactionOutcome::Rollback(Err(
+						Error::<T, I>::FailedToTransferFromSwapAccount.into(),
+					))
+				}
 
-			log::trace!(
-				target: "runtime::bridge-token-swap",
-				"The swap {:?} (hash {:?}) has been completed with {} status",
-				swap,
-				swap_hash,
-				match event {
-					Event::SwapClaimed(_) => "claimed",
-					Event::SwapCanceled(_) => "canceled",
-					_ => "<unknown>",
-				},
-			);
+				log::trace!(
+					target: "runtime::bridge-token-swap",
+					"The swap {:?} (hash {:?}) has been completed with {} status",
+					swap,
+					swap_hash,
+					match event {
+						Event::SwapClaimed(_) => "claimed",
+						Event::SwapCanceled(_) => "canceled",
+						_ => "<unknown>",
+					},
+				);
 
-			// forget about swap
-			PendingSwaps::<T, I>::remove(swap_hash);
+				// forget about swap
+				PendingSwaps::<T, I>::remove(swap_hash);
 
-			// finally - emit the event
-			Pallet::<T, I>::deposit_event(event);
+				// finally - emit the event
+				Pallet::<T, I>::deposit_event(event);
 
-			sp_runtime::TransactionOutcome::Commit(Ok(().into()))
-		})
+				sp_runtime::TransactionOutcome::Commit(Ok(Ok(().into())))
+			},
+		)?
 	}
 }
 
diff --git a/primitives/chain-millau/Cargo.toml b/primitives/chain-millau/Cargo.toml
index 0aaeb5b6bf..4cd8b30f7f 100644
--- a/primitives/chain-millau/Cargo.toml
+++ b/primitives/chain-millau/Cargo.toml
@@ -17,7 +17,7 @@ hash256-std-hasher = { version = "0.15.2", default-features = false }
 impl-codec = { version = "0.6", default-features = false }
 impl-serde = { version = "0.3.1", optional = true }
 parity-util-mem = { version = "0.11", default-features = false, features = ["primitive-types"] }
-scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 serde = { version = "1.0", optional = true, features = ["derive"] }
 
 # Substrate Based Dependencies
diff --git a/primitives/chain-westend/Cargo.toml b/primitives/chain-westend/Cargo.toml
index ee6e2b9be9..6a894f35c2 100644
--- a/primitives/chain-westend/Cargo.toml
+++ b/primitives/chain-westend/Cargo.toml
@@ -8,7 +8,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] }
-scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 smallvec = "1.7"
 
 # Bridge Dependencies
diff --git a/primitives/header-chain/Cargo.toml b/primitives/header-chain/Cargo.toml
index 7cd688d0d8..c925abf962 100644
--- a/primitives/header-chain/Cargo.toml
+++ b/primitives/header-chain/Cargo.toml
@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
 finality-grandpa = { version = "0.15.0", default-features = false }
-scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 serde = { version = "1.0", optional = true }
 
 # Bridge dependencies
diff --git a/primitives/message-dispatch/Cargo.toml b/primitives/message-dispatch/Cargo.toml
index 39b2d00111..02b0912894 100644
--- a/primitives/message-dispatch/Cargo.toml
+++ b/primitives/message-dispatch/Cargo.toml
@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 [dependencies]
 bp-runtime = { path = "../runtime", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 
 # Substrate Dependencies
 
diff --git a/primitives/messages/Cargo.toml b/primitives/messages/Cargo.toml
index 2a84f74d22..af5e801f8d 100644
--- a/primitives/messages/Cargo.toml
+++ b/primitives/messages/Cargo.toml
@@ -10,7 +10,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 bitvec = { version = "1", default-features = false, features = ["alloc"] }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "bit-vec"] }
 impl-trait-for-tuples = "0.2"
-scale-info = { version = "2.0.1", default-features = false, features = ["bit-vec", "derive"] }
+scale-info = { version = "2.1.1", default-features = false, features = ["bit-vec", "derive"] }
 serde = { version = "1.0", optional = true, features = ["derive"] }
 
 # Bridge dependencies
diff --git a/primitives/polkadot-core/Cargo.toml b/primitives/polkadot-core/Cargo.toml
index 1542a784ef..ce756d0897 100644
--- a/primitives/polkadot-core/Cargo.toml
+++ b/primitives/polkadot-core/Cargo.toml
@@ -8,7 +8,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] }
-scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 
 # Bridge Dependencies
 
diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml
index 085cfb9dbc..20208fd5fa 100644
--- a/primitives/runtime/Cargo.toml
+++ b/primitives/runtime/Cargo.toml
@@ -10,7 +10,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
 hash-db = { version = "0.15.2", default-features = false }
 num-traits = { version = "0.2", default-features = false }
-scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 
 # Substrate Dependencies
 
diff --git a/primitives/test-utils/src/lib.rs b/primitives/test-utils/src/lib.rs
index 9e044ed472..38d9453c98 100644
--- a/primitives/test-utils/src/lib.rs
+++ b/primitives/test-utils/src/lib.rs
@@ -20,7 +20,6 @@
 
 use bp_header_chain::justification::GrandpaJustification;
 use codec::Encode;
-use sp_application_crypto::TryFrom;
 use sp_finality_grandpa::{AuthorityId, AuthoritySignature, AuthorityWeight, SetId};
 use sp_runtime::traits::{Header as HeaderT, One, Zero};
 use sp_std::prelude::*;
diff --git a/primitives/token-swap/Cargo.toml b/primitives/token-swap/Cargo.toml
index 9097856f85..7ef5845d2a 100644
--- a/primitives/token-swap/Cargo.toml
+++ b/primitives/token-swap/Cargo.toml
@@ -8,7 +8,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 
 # Bridge Dependencies
 
diff --git a/relays/bin-substrate/Cargo.toml b/relays/bin-substrate/Cargo.toml
index fb8ff467d0..018fbfd2dd 100644
--- a/relays/bin-substrate/Cargo.toml
+++ b/relays/bin-substrate/Cargo.toml
@@ -8,7 +8,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 [dependencies]
 anyhow = "1.0"
 async-std = "1.9.0"
-async-trait = "0.1.42"
+async-trait = "0.1"
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 futures = "0.3.12"
 hex = "0.4"
@@ -68,10 +68,10 @@ sp-version = { git = "https://github.com/paritytech/substrate", branch = "master
 
 # Polkadot Dependencies
 
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3" }
+polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3" }
+polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3" }
 
 [dev-dependencies]
 bp-test-utils = { path = "../../primitives/test-utils" }
diff --git a/relays/client-kusama/Cargo.toml b/relays/client-kusama/Cargo.toml
index 35c24c1089..8ab3a27fd7 100644
--- a/relays/client-kusama/Cargo.toml
+++ b/relays/client-kusama/Cargo.toml
@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 relay-substrate-client = { path = "../client-substrate" }
 relay-utils = { path = "../utils" }
-scale-info = { version = "2.0.1", features = ["derive"] }
+scale-info = { version = "2.1.1", features = ["derive"] }
 
 # Bridge dependencies
 
diff --git a/relays/client-polkadot/Cargo.toml b/relays/client-polkadot/Cargo.toml
index 96cfa2ce1b..1d61f0b4cd 100644
--- a/relays/client-polkadot/Cargo.toml
+++ b/relays/client-polkadot/Cargo.toml
@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 relay-substrate-client = { path = "../client-substrate" }
 relay-utils = { path = "../utils" }
-scale-info = { version = "2.0.1", features = ["derive"] }
+scale-info = { version = "2.1.1", features = ["derive"] }
 
 # Bridge dependencies
 
diff --git a/relays/client-rococo/Cargo.toml b/relays/client-rococo/Cargo.toml
index 2b78684a85..a2d84c4960 100644
--- a/relays/client-rococo/Cargo.toml
+++ b/relays/client-rococo/Cargo.toml
@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 relay-substrate-client = { path = "../client-substrate" }
 relay-utils = { path = "../utils" }
-scale-info = { version = "2.0.1", features = ["derive"] }
+scale-info = { version = "2.1.1", features = ["derive"] }
 
 # Bridge dependencies
 
diff --git a/relays/client-substrate/Cargo.toml b/relays/client-substrate/Cargo.toml
index dad864965e..5298009d87 100644
--- a/relays/client-substrate/Cargo.toml
+++ b/relays/client-substrate/Cargo.toml
@@ -7,7 +7,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 async-std = { version = "1.6.5", features = ["attributes"] }
-async-trait = "0.1.40"
+async-trait = "0.1"
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 jsonrpsee = { version = "0.8", features = ["macros", "ws-client"] }
 log = "0.4.11"
diff --git a/relays/client-wococo/Cargo.toml b/relays/client-wococo/Cargo.toml
index 6845ac34c8..d9d892a920 100644
--- a/relays/client-wococo/Cargo.toml
+++ b/relays/client-wococo/Cargo.toml
@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 relay-substrate-client = { path = "../client-substrate" }
 relay-utils = { path = "../utils" }
-scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 
 # Bridge dependencies
 bridge-runtime-common = { path = "../../bin/runtime-common" }
diff --git a/relays/finality/Cargo.toml b/relays/finality/Cargo.toml
index cc5ae54be3..692e902ace 100644
--- a/relays/finality/Cargo.toml
+++ b/relays/finality/Cargo.toml
@@ -8,7 +8,7 @@ description = "Finality proofs relay"
 
 [dependencies]
 async-std = "1.6.5"
-async-trait = "0.1.40"
+async-trait = "0.1"
 backoff = "0.2"
 bp-header-chain = { path = "../../primitives/header-chain" }
 futures = "0.3.5"
diff --git a/relays/lib-substrate-relay/Cargo.toml b/relays/lib-substrate-relay/Cargo.toml
index e2cabf52f4..b8bfcc9601 100644
--- a/relays/lib-substrate-relay/Cargo.toml
+++ b/relays/lib-substrate-relay/Cargo.toml
@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 anyhow = "1.0"
 thiserror = "1.0.26"
 async-std = "1.9.0"
-async-trait = "0.1.42"
+async-trait = "0.1"
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 futures = "0.3.12"
 num-traits = "0.2"
diff --git a/relays/messages/Cargo.toml b/relays/messages/Cargo.toml
index b3357994b1..af967f34ac 100644
--- a/relays/messages/Cargo.toml
+++ b/relays/messages/Cargo.toml
@@ -7,7 +7,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 async-std = { version = "1.6.5", features = ["attributes"] }
-async-trait = "0.1.40"
+async-trait = "0.1"
 futures = "0.3.5"
 hex = "0.4"
 log = "0.4.11"
diff --git a/relays/utils/Cargo.toml b/relays/utils/Cargo.toml
index bb69849da2..af5baa5ccf 100644
--- a/relays/utils/Cargo.toml
+++ b/relays/utils/Cargo.toml
@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 ansi_term = "0.12"
 anyhow = "1.0"
 async-std = "1.6.5"
-async-trait = "0.1.40"
+async-trait = "0.1"
 backoff = "0.2"
 isahc = "1.2"
 env_logger = "0.8.2"