diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d6a2644b00f..3c5b4aa6fbe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -121,7 +121,7 @@ check:
<<: *docker-env
<<: *test-refs
script: &check-script
- - SKIP_WASM_BUILD=1 time cargo check --locked --verbose --workspace --features runtime-benchmarks
+ - SKIP_WASM_BUILD=1 time cargo check --locked --verbose --workspace
check-nightly:
stage: test
@@ -142,7 +142,7 @@ test:
# Enable this, when you see: "`cargo metadata` can not fail on project `Cargo.toml`"
#- time cargo fetch --manifest-path=`cargo metadata --format-version=1 | jq --compact-output --raw-output ".packages[] | select(.name == \"polkadot-runtime\").manifest_path"`
#- 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_WASM_BUILD=1 time cargo test --verbose --workspace --features runtime-benchmarks
+ - CARGO_NET_OFFLINE=true SKIP_WASM_BUILD=1 time cargo test --verbose --workspace
test-nightly:
stage: test
diff --git a/Cargo.lock b/Cargo.lock
index e1d46834cf3..3097d742213 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -936,15 +936,6 @@ dependencies = [
"serde",
]
-[[package]]
-name = "binary-merkle-tree"
-version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
-dependencies = [
- "hash-db",
- "log",
-]
-
[[package]]
name = "bincode"
version = "1.3.3"
@@ -1122,46 +1113,10 @@ dependencies = [
"serde",
]
-[[package]]
-name = "bp-asset-hub-rococo"
-version = "0.4.0"
-dependencies = [
- "bp-xcm-bridge-hub-router",
- "frame-support",
- "parity-scale-codec",
- "scale-info",
-]
-
-[[package]]
-name = "bp-asset-hub-westend"
-version = "0.3.0"
-dependencies = [
- "bp-xcm-bridge-hub-router",
- "frame-support",
- "parity-scale-codec",
- "scale-info",
-]
-
-[[package]]
-name = "bp-beefy"
-version = "0.1.0"
-dependencies = [
- "binary-merkle-tree",
- "bp-runtime",
- "frame-support",
- "pallet-beefy-mmr",
- "pallet-mmr",
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-consensus-beefy",
- "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
-]
-
[[package]]
name = "bp-bridge-hub-cumulus"
version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bp-messages",
"bp-polkadot-core",
@@ -1176,6 +1131,7 @@ dependencies = [
[[package]]
name = "bp-bridge-hub-kusama"
version = "0.6.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bp-bridge-hub-cumulus",
"bp-messages",
@@ -1189,6 +1145,7 @@ dependencies = [
[[package]]
name = "bp-bridge-hub-polkadot"
version = "0.6.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bp-bridge-hub-cumulus",
"bp-messages",
@@ -1202,6 +1159,7 @@ dependencies = [
[[package]]
name = "bp-bridge-hub-rococo"
version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bp-bridge-hub-cumulus",
"bp-messages",
@@ -1215,6 +1173,7 @@ dependencies = [
[[package]]
name = "bp-bridge-hub-westend"
version = "0.3.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bp-bridge-hub-cumulus",
"bp-messages",
@@ -1228,13 +1187,11 @@ dependencies = [
[[package]]
name = "bp-header-chain"
version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bp-runtime",
- "bp-test-utils",
"finality-grandpa",
"frame-support",
- "hex",
- "hex-literal",
"parity-scale-codec",
"scale-info",
"serde",
@@ -1247,6 +1204,7 @@ dependencies = [
[[package]]
name = "bp-kusama"
version = "0.5.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bp-header-chain",
"bp-polkadot-core",
@@ -1259,12 +1217,11 @@ dependencies = [
[[package]]
name = "bp-messages"
version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bp-header-chain",
"bp-runtime",
"frame-support",
- "hex",
- "hex-literal",
"parity-scale-codec",
"scale-info",
"serde",
@@ -1275,6 +1232,7 @@ dependencies = [
[[package]]
name = "bp-parachains"
version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bp-header-chain",
"bp-polkadot-core",
@@ -1291,6 +1249,7 @@ dependencies = [
[[package]]
name = "bp-polkadot"
version = "0.5.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bp-header-chain",
"bp-polkadot-core",
@@ -1303,6 +1262,7 @@ dependencies = [
[[package]]
name = "bp-polkadot-bulletin"
version = "0.4.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bp-header-chain",
"bp-messages",
@@ -1320,12 +1280,12 @@ dependencies = [
[[package]]
name = "bp-polkadot-core"
version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bp-messages",
"bp-runtime",
"frame-support",
"frame-system",
- "hex",
"parity-scale-codec",
"parity-util-mem",
"scale-info",
@@ -1338,12 +1298,11 @@ dependencies = [
[[package]]
name = "bp-relayers"
version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bp-messages",
"bp-runtime",
"frame-support",
- "hex",
- "hex-literal",
"parity-scale-codec",
"scale-info",
"sp-runtime",
@@ -1353,6 +1312,7 @@ dependencies = [
[[package]]
name = "bp-rococo"
version = "0.6.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bp-header-chain",
"bp-polkadot-core",
@@ -1365,11 +1325,11 @@ dependencies = [
[[package]]
name = "bp-runtime"
version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"frame-support",
"frame-system",
"hash-db",
- "hex-literal",
"impl-trait-for-tuples",
"log",
"num-traits",
@@ -1388,6 +1348,7 @@ dependencies = [
[[package]]
name = "bp-test-utils"
version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bp-header-chain",
"bp-parachains",
@@ -1407,6 +1368,7 @@ dependencies = [
[[package]]
name = "bp-westend"
version = "0.3.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bp-header-chain",
"bp-polkadot-core",
@@ -1419,6 +1381,7 @@ dependencies = [
[[package]]
name = "bp-xcm-bridge-hub"
version = "0.2.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
]
@@ -1426,6 +1389,7 @@ dependencies = [
[[package]]
name = "bp-xcm-bridge-hub-router"
version = "0.6.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -1436,6 +1400,7 @@ dependencies = [
[[package]]
name = "bridge-runtime-common"
version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bp-header-chain",
"bp-messages",
@@ -1443,14 +1408,12 @@ dependencies = [
"bp-polkadot-core",
"bp-relayers",
"bp-runtime",
- "bp-test-utils",
"bp-xcm-bridge-hub",
"bp-xcm-bridge-hub-router",
"frame-support",
"frame-system",
"hash-db",
"log",
- "pallet-balances",
"pallet-bridge-grandpa",
"pallet-bridge-messages",
"pallet-bridge-parachains",
@@ -1467,7 +1430,6 @@ dependencies = [
"sp-trie",
"staging-xcm",
"staging-xcm-builder",
- "static_assertions",
]
[[package]]
@@ -1656,15 +1618,6 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "ckb-merkle-mountain-range"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56ccb671c5921be8a84686e6212ca184cb1d7c51cadcdbfcbd1cc3f042f5dfb8"
-dependencies = [
- "cfg-if",
-]
-
[[package]]
name = "clap"
version = "2.34.0"
@@ -2637,6 +2590,7 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "equivocation-detector"
version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"async-std",
"async-trait",
@@ -2838,6 +2792,7 @@ dependencies = [
[[package]]
name = "finality-relay"
version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"async-std",
"async-trait",
@@ -2846,7 +2801,6 @@ dependencies = [
"futures",
"log",
"num-traits",
- "parking_lot 0.12.1",
"relay-utils",
]
@@ -2927,7 +2881,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
[[package]]
name = "frame-benchmarking"
version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"frame-support",
"frame-support-procedural",
@@ -2975,7 +2929,7 @@ dependencies = [
[[package]]
name = "frame-support"
version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"aquamarine",
"array-bytes 6.2.2",
@@ -3016,7 +2970,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural"
version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"Inflector",
"cfg-expr",
@@ -3035,7 +2989,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools"
version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate 3.1.0",
@@ -3047,7 +3001,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools-derive"
version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"proc-macro2 1.0.79",
"quote 1.0.35",
@@ -3057,7 +3011,7 @@ dependencies = [
[[package]]
name = "frame-system"
version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"cfg-if",
"docify",
@@ -4966,6 +4920,7 @@ dependencies = [
[[package]]
name = "messages-relay"
version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"async-std",
"async-trait",
@@ -5529,7 +5484,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "pallet-authorship"
version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"frame-support",
"frame-system",
@@ -5543,7 +5498,7 @@ dependencies = [
[[package]]
name = "pallet-balances"
version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"docify",
"frame-benchmarking",
@@ -5556,78 +5511,10 @@ dependencies = [
"sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
]
-[[package]]
-name = "pallet-beefy"
-version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
-dependencies = [
- "frame-support",
- "frame-system",
- "log",
- "pallet-authorship",
- "pallet-session",
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-consensus-beefy",
- "sp-runtime",
- "sp-session",
- "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
-]
-
-[[package]]
-name = "pallet-beefy-mmr"
-version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
-dependencies = [
- "array-bytes 6.2.2",
- "binary-merkle-tree",
- "frame-support",
- "frame-system",
- "log",
- "pallet-beefy",
- "pallet-mmr",
- "pallet-session",
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-api",
- "sp-consensus-beefy",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
-]
-
-[[package]]
-name = "pallet-bridge-beefy"
-version = "0.1.0"
-dependencies = [
- "bp-beefy",
- "bp-runtime",
- "bp-test-utils",
- "ckb-merkle-mountain-range",
- "frame-support",
- "frame-system",
- "log",
- "pallet-beefy-mmr",
- "pallet-mmr",
- "parity-scale-codec",
- "rand 0.8.5",
- "scale-info",
- "serde",
- "sp-consensus-beefy",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
-]
-
[[package]]
name = "pallet-bridge-grandpa"
version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bp-header-chain",
"bp-runtime",
@@ -5640,8 +5527,6 @@ dependencies = [
"parity-scale-codec",
"scale-info",
"sp-consensus-grandpa",
- "sp-core",
- "sp-io",
"sp-runtime",
"sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
"sp-trie",
@@ -5650,19 +5535,17 @@ dependencies = [
[[package]]
name = "pallet-bridge-messages"
version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bp-messages",
"bp-runtime",
- "bp-test-utils",
"frame-benchmarking",
"frame-support",
"frame-system",
"log",
"num-traits",
- "pallet-balances",
"parity-scale-codec",
"scale-info",
- "sp-io",
"sp-runtime",
"sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
]
@@ -5670,12 +5553,12 @@ dependencies = [
[[package]]
name = "pallet-bridge-parachains"
version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bp-header-chain",
"bp-parachains",
"bp-polkadot-core",
"bp-runtime",
- "bp-test-utils",
"frame-benchmarking",
"frame-support",
"frame-system",
@@ -5683,8 +5566,6 @@ dependencies = [
"pallet-bridge-grandpa",
"parity-scale-codec",
"scale-info",
- "sp-core",
- "sp-io",
"sp-runtime",
"sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
"sp-trie",
@@ -5693,6 +5574,7 @@ dependencies = [
[[package]]
name = "pallet-bridge-relayers"
version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bp-messages",
"bp-relayers",
@@ -5701,12 +5583,10 @@ dependencies = [
"frame-support",
"frame-system",
"log",
- "pallet-balances",
"pallet-bridge-messages",
"parity-scale-codec",
"scale-info",
"sp-arithmetic",
- "sp-io",
"sp-runtime",
"sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
]
@@ -5714,7 +5594,7 @@ dependencies = [
[[package]]
name = "pallet-grandpa"
version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5734,28 +5614,10 @@ dependencies = [
"sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
]
-[[package]]
-name = "pallet-mmr"
-version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
-dependencies = [
- "frame-benchmarking",
- "frame-support",
- "frame-system",
- "log",
- "parity-scale-codec",
- "scale-info",
- "sp-core",
- "sp-io",
- "sp-mmr-primitives",
- "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
-]
-
[[package]]
name = "pallet-session"
version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"frame-support",
"frame-system",
@@ -5777,7 +5639,7 @@ dependencies = [
[[package]]
name = "pallet-timestamp"
version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"docify",
"frame-benchmarking",
@@ -5797,7 +5659,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment"
version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"frame-support",
"frame-system",
@@ -5813,7 +5675,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc-runtime-api"
version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"pallet-transaction-payment",
"parity-scale-codec",
@@ -5825,7 +5687,7 @@ dependencies = [
[[package]]
name = "pallet-utility"
version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5838,63 +5700,18 @@ dependencies = [
"sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
]
-[[package]]
-name = "pallet-xcm-bridge-hub"
-version = "0.2.0"
-dependencies = [
- "bp-header-chain",
- "bp-messages",
- "bp-runtime",
- "bp-xcm-bridge-hub",
- "bridge-runtime-common",
- "frame-support",
- "frame-system",
- "log",
- "pallet-balances",
- "pallet-bridge-messages",
- "parity-scale-codec",
- "scale-info",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
- "staging-xcm",
- "staging-xcm-builder",
- "staging-xcm-executor",
-]
-
-[[package]]
-name = "pallet-xcm-bridge-hub-router"
-version = "0.5.0"
-dependencies = [
- "bp-xcm-bridge-hub-router",
- "frame-benchmarking",
- "frame-support",
- "frame-system",
- "log",
- "parity-scale-codec",
- "scale-info",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
- "staging-xcm",
- "staging-xcm-builder",
-]
-
[[package]]
name = "parachains-relay"
version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"async-std",
"async-trait",
"bp-polkadot-core",
"futures",
"log",
- "parity-scale-codec",
"relay-substrate-client",
"relay-utils",
- "sp-core",
]
[[package]]
@@ -5905,7 +5722,7 @@ checksum = "4e69bf016dc406eff7d53a7d3f7cf1c2e72c82b9088aac1118591e36dd2cd3e9"
dependencies = [
"bitcoin_hashes 0.13.0",
"rand 0.8.5",
- "rand_core 0.5.1",
+ "rand_core 0.6.4",
"serde",
"unicode-normalization",
]
@@ -6164,7 +5981,7 @@ checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7"
[[package]]
name = "polkadot-core-primitives"
version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -6176,7 +5993,7 @@ dependencies = [
[[package]]
name = "polkadot-parachain-primitives"
version = "6.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bounded-collections",
"derive_more",
@@ -6193,7 +6010,7 @@ dependencies = [
[[package]]
name = "polkadot-primitives"
version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bitvec",
"hex-literal",
@@ -7117,6 +6934,7 @@ dependencies = [
[[package]]
name = "relay-substrate-client"
version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"async-std",
"async-trait",
@@ -7158,6 +6976,7 @@ dependencies = [
[[package]]
name = "relay-utils"
version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"ansi_term",
"anyhow",
@@ -7537,7 +7356,7 @@ dependencies = [
[[package]]
name = "sc-allocator"
version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"log",
"sp-core",
@@ -7548,7 +7367,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec"
version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"array-bytes 6.2.2",
"docify",
@@ -7575,7 +7394,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec-derive"
version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"proc-macro-crate 3.1.0",
"proc-macro2 1.0.79",
@@ -7586,7 +7405,7 @@ dependencies = [
[[package]]
name = "sc-client-api"
version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"fnv",
"futures",
@@ -7613,7 +7432,7 @@ dependencies = [
[[package]]
name = "sc-consensus"
version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"async-trait",
"futures",
@@ -7638,7 +7457,7 @@ dependencies = [
[[package]]
name = "sc-executor"
version = "0.32.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"parity-scale-codec",
"parking_lot 0.12.1",
@@ -7661,7 +7480,7 @@ dependencies = [
[[package]]
name = "sc-executor-common"
version = "0.29.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"polkavm",
"sc-allocator",
@@ -7674,7 +7493,7 @@ dependencies = [
[[package]]
name = "sc-executor-polkavm"
version = "0.29.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"log",
"polkavm",
@@ -7685,7 +7504,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmtime"
version = "0.29.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"anyhow",
"cfg-if",
@@ -7703,7 +7522,7 @@ dependencies = [
[[package]]
name = "sc-mixnet"
version = "0.4.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"array-bytes 4.2.0",
"arrayvec 0.7.4",
@@ -7732,7 +7551,7 @@ dependencies = [
[[package]]
name = "sc-network"
version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"array-bytes 6.2.2",
"async-channel 1.9.0",
@@ -7783,7 +7602,7 @@ dependencies = [
[[package]]
name = "sc-network-common"
version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"async-trait",
"bitflags 1.3.2",
@@ -7801,7 +7620,7 @@ dependencies = [
[[package]]
name = "sc-network-types"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bs58 0.4.0",
"libp2p-identity",
@@ -7815,7 +7634,7 @@ dependencies = [
[[package]]
name = "sc-rpc-api"
version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"jsonrpsee 0.22.4",
"parity-scale-codec",
@@ -7835,7 +7654,7 @@ dependencies = [
[[package]]
name = "sc-telemetry"
version = "15.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"chrono",
"futures",
@@ -7855,7 +7674,7 @@ dependencies = [
[[package]]
name = "sc-transaction-pool-api"
version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"async-trait",
"futures",
@@ -7871,7 +7690,7 @@ dependencies = [
[[package]]
name = "sc-utils"
version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"async-channel 1.9.0",
"futures",
@@ -8569,7 +8388,7 @@ dependencies = [
[[package]]
name = "sp-api"
version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"hash-db",
"log",
@@ -8591,7 +8410,7 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
version = "15.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"Inflector",
"blake2 0.10.6",
@@ -8605,7 +8424,7 @@ dependencies = [
[[package]]
name = "sp-application-crypto"
version = "30.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -8618,7 +8437,7 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"docify",
"integer-sqrt",
@@ -8651,7 +8470,7 @@ dependencies = [
[[package]]
name = "sp-authority-discovery"
version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -8663,7 +8482,7 @@ dependencies = [
[[package]]
name = "sp-blockchain"
version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"futures",
"log",
@@ -8681,7 +8500,7 @@ dependencies = [
[[package]]
name = "sp-consensus"
version = "0.32.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"async-trait",
"futures",
@@ -8693,30 +8512,10 @@ dependencies = [
"thiserror",
]
-[[package]]
-name = "sp-consensus-beefy"
-version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
-dependencies = [
- "lazy_static",
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-api",
- "sp-application-crypto",
- "sp-core",
- "sp-crypto-hashing",
- "sp-io",
- "sp-keystore",
- "sp-mmr-primitives",
- "sp-runtime",
- "strum",
-]
-
[[package]]
name = "sp-consensus-grandpa"
version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"finality-grandpa",
"log",
@@ -8733,7 +8532,7 @@ dependencies = [
[[package]]
name = "sp-consensus-slots"
version = "0.32.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -8744,7 +8543,7 @@ dependencies = [
[[package]]
name = "sp-core"
version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"array-bytes 6.2.2",
"bandersnatch_vrfs",
@@ -8806,7 +8605,7 @@ dependencies = [
[[package]]
name = "sp-crypto-ec-utils"
version = "0.10.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"ark-bls12-377",
"ark-bls12-377-ext",
@@ -8826,7 +8625,7 @@ dependencies = [
[[package]]
name = "sp-crypto-hashing"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"blake2b_simd",
"byteorder",
@@ -8839,7 +8638,7 @@ dependencies = [
[[package]]
name = "sp-crypto-hashing-proc-macro"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"quote 1.0.35",
"sp-crypto-hashing",
@@ -8849,7 +8648,7 @@ dependencies = [
[[package]]
name = "sp-database"
version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"kvdb",
"parking_lot 0.12.1",
@@ -8858,7 +8657,7 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"proc-macro2 1.0.79",
"quote 1.0.35",
@@ -8868,7 +8667,7 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"proc-macro2 1.0.79",
"quote 1.0.35",
@@ -8878,7 +8677,7 @@ dependencies = [
[[package]]
name = "sp-externalities"
version = "0.25.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -8888,7 +8687,7 @@ dependencies = [
[[package]]
name = "sp-externalities"
version = "0.25.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -8898,7 +8697,7 @@ dependencies = [
[[package]]
name = "sp-genesis-builder"
version = "0.8.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -8910,7 +8709,7 @@ dependencies = [
[[package]]
name = "sp-inherents"
version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"async-trait",
"impl-trait-for-tuples",
@@ -8923,7 +8722,7 @@ dependencies = [
[[package]]
name = "sp-io"
version = "30.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bytes",
"ed25519-dalek 2.1.1",
@@ -8949,7 +8748,7 @@ dependencies = [
[[package]]
name = "sp-keyring"
version = "31.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"sp-core",
"sp-runtime",
@@ -8959,7 +8758,7 @@ dependencies = [
[[package]]
name = "sp-keystore"
version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"parity-scale-codec",
"parking_lot 0.12.1",
@@ -8970,7 +8769,7 @@ dependencies = [
[[package]]
name = "sp-maybe-compressed-blob"
version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"thiserror",
"zstd 0.12.4",
@@ -8979,7 +8778,7 @@ dependencies = [
[[package]]
name = "sp-metadata-ir"
version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"frame-metadata 16.0.0",
"parity-scale-codec",
@@ -8989,7 +8788,7 @@ dependencies = [
[[package]]
name = "sp-mixnet"
version = "0.4.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -8997,27 +8796,10 @@ dependencies = [
"sp-application-crypto",
]
-[[package]]
-name = "sp-mmr-primitives"
-version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
-dependencies = [
- "ckb-merkle-mountain-range",
- "log",
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-api",
- "sp-core",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
- "sp-runtime",
- "thiserror",
-]
-
[[package]]
name = "sp-panic-handler"
version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"backtrace",
"lazy_static",
@@ -9027,7 +8809,7 @@ dependencies = [
[[package]]
name = "sp-rpc"
version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"rustc-hash",
"serde",
@@ -9037,7 +8819,7 @@ dependencies = [
[[package]]
name = "sp-runtime"
version = "31.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"docify",
"either",
@@ -9061,7 +8843,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
version = "24.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bytes",
"impl-trait-for-tuples",
@@ -9080,7 +8862,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
version = "24.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bytes",
"impl-trait-for-tuples",
@@ -9099,7 +8881,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"Inflector",
"expander",
@@ -9112,7 +8894,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"Inflector",
"expander",
@@ -9125,7 +8907,7 @@ dependencies = [
[[package]]
name = "sp-session"
version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -9139,7 +8921,7 @@ dependencies = [
[[package]]
name = "sp-staking"
version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -9152,7 +8934,7 @@ dependencies = [
[[package]]
name = "sp-state-machine"
version = "0.35.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"hash-db",
"log",
@@ -9172,7 +8954,7 @@ dependencies = [
[[package]]
name = "sp-statement-store"
version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"aes-gcm",
"curve25519-dalek 4.1.1",
@@ -9202,17 +8984,17 @@ checksum = "53458e3c57df53698b3401ec0934bea8e8cfce034816873c0b0abbd83d7bac0d"
[[package]]
name = "sp-std"
version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
[[package]]
name = "sp-std"
version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk#92e142555d45f97aa88d241665d9952d12f4ae40"
[[package]]
name = "sp-storage"
version = "19.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -9224,7 +9006,7 @@ dependencies = [
[[package]]
name = "sp-storage"
version = "19.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -9236,7 +9018,7 @@ dependencies = [
[[package]]
name = "sp-timestamp"
version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -9248,7 +9030,7 @@ dependencies = [
[[package]]
name = "sp-tracing"
version = "16.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"parity-scale-codec",
"tracing",
@@ -9259,7 +9041,7 @@ dependencies = [
[[package]]
name = "sp-tracing"
version = "16.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"parity-scale-codec",
"tracing",
@@ -9270,7 +9052,7 @@ dependencies = [
[[package]]
name = "sp-trie"
version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"ahash 0.8.11",
"hash-db",
@@ -9293,7 +9075,7 @@ dependencies = [
[[package]]
name = "sp-version"
version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -9310,7 +9092,7 @@ dependencies = [
[[package]]
name = "sp-version-proc-macro"
version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"parity-scale-codec",
"proc-macro2 1.0.79",
@@ -9321,7 +9103,7 @@ dependencies = [
[[package]]
name = "sp-wasm-interface"
version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"anyhow",
"impl-trait-for-tuples",
@@ -9333,7 +9115,7 @@ dependencies = [
[[package]]
name = "sp-wasm-interface"
version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"impl-trait-for-tuples",
"log",
@@ -9343,7 +9125,7 @@ dependencies = [
[[package]]
name = "sp-weights"
version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"bounded-collections",
"parity-scale-codec",
@@ -9400,7 +9182,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "staging-xcm"
version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"array-bytes 6.2.2",
"bounded-collections",
@@ -9418,7 +9200,7 @@ dependencies = [
[[package]]
name = "staging-xcm-builder"
version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"frame-support",
"frame-system",
@@ -9440,7 +9222,7 @@ dependencies = [
[[package]]
name = "staging-xcm-executor"
version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"environmental",
"frame-benchmarking",
@@ -9545,7 +9327,7 @@ dependencies = [
[[package]]
name = "substrate-bip39"
version = "0.4.7"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"hmac 0.12.1",
"pbkdf2",
@@ -9557,7 +9339,7 @@ dependencies = [
[[package]]
name = "substrate-prometheus-endpoint"
version = "0.17.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"hyper",
"log",
@@ -9623,6 +9405,7 @@ dependencies = [
[[package]]
name = "substrate-relay-helper"
version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"anyhow",
"async-std",
@@ -9649,7 +9432,6 @@ dependencies = [
"pallet-bridge-messages",
"pallet-bridge-parachains",
"pallet-grandpa",
- "pallet-transaction-payment",
"parachains-relay",
"parity-scale-codec",
"rbtag",
@@ -11416,7 +11198,7 @@ dependencies = [
[[package]]
name = "xcm-procedural"
version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#74a42cebc1a9fd4e4a7713d5e41caba77a0fa172"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#92e142555d45f97aa88d241665d9952d12f4ae40"
dependencies = [
"Inflector",
"proc-macro2 1.0.79",
diff --git a/Cargo.toml b/Cargo.toml
index d79967875c4..2666706d369 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,36 +7,6 @@ license = "GPL-3.0-only"
[workspace]
resolver = "2"
members = [
- "bin/runtime-common",
- "chains/chain-asset-hub-rococo",
- "chains/chain-asset-hub-westend",
- "chains/chain-bridge-hub-cumulus",
- "chains/chain-bridge-hub-kusama",
- "chains/chain-bridge-hub-polkadot",
- "chains/chain-bridge-hub-rococo",
- "chains/chain-bridge-hub-westend",
- "chains/chain-kusama",
- "chains/chain-polkadot",
- "chains/chain-polkadot-bulletin",
- "chains/chain-rococo",
- "chains/chain-westend",
- "modules/beefy",
- "modules/grandpa",
- "modules/messages",
- "modules/parachains",
- "modules/relayers",
- "modules/xcm-bridge-hub",
- "modules/xcm-bridge-hub-router",
- "primitives/beefy",
- "primitives/header-chain",
- "primitives/messages",
- "primitives/parachains",
- "primitives/polkadot-core",
- "primitives/relayers",
- "primitives/runtime",
- "primitives/test-utils",
- "primitives/xcm-bridge-hub",
- "primitives/xcm-bridge-hub-router",
"relay-clients/client-bridge-hub-kusama",
"relay-clients/client-bridge-hub-polkadot",
"relay-clients/client-bridge-hub-rococo",
@@ -46,13 +16,6 @@ members = [
"relay-clients/client-polkadot-bulletin",
"relay-clients/client-rococo",
"relay-clients/client-westend",
- "relays/client-substrate",
- "relays/equivocation",
- "relays/finality",
- "relays/lib-substrate-relay",
- "relays/messages",
- "relays/parachains",
- "relays/utils",
"substrate-relay",
]
diff --git a/bin/runtime-common/Cargo.toml b/bin/runtime-common/Cargo.toml
deleted file mode 100644
index 6304c83b905..00000000000
--- a/bin/runtime-common/Cargo.toml
+++ /dev/null
@@ -1,100 +0,0 @@
-[package]
-name = "bridge-runtime-common"
-version = "0.7.0"
-description = "Common types and functions that may be used by substrate-based runtimes of all bridged chains"
-authors.workspace = true
-edition.workspace = true
-repository.workspace = true
-license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-
-[lints]
-workspace = true
-
-[dependencies]
-codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
-hash-db = { version = "0.16.0", default-features = false }
-log = { workspace = true }
-scale-info = { version = "2.11.1", default-features = false, features = ["derive"] }
-static_assertions = { version = "1.1", optional = true }
-
-# Bridge dependencies
-
-bp-header-chain = { path = "../../primitives/header-chain", default-features = false }
-bp-messages = { path = "../../primitives/messages", default-features = false }
-bp-parachains = { path = "../../primitives/parachains", default-features = false }
-bp-polkadot-core = { path = "../../primitives/polkadot-core", default-features = false }
-bp-relayers = { path = "../../primitives/relayers", default-features = false }
-bp-runtime = { path = "../../primitives/runtime", default-features = false }
-bp-xcm-bridge-hub = { path = "../../primitives/xcm-bridge-hub", default-features = false }
-bp-xcm-bridge-hub-router = { path = "../../primitives/xcm-bridge-hub-router", default-features = false }
-pallet-bridge-grandpa = { path = "../../modules/grandpa", default-features = false }
-pallet-bridge-messages = { path = "../../modules/messages", default-features = false }
-pallet-bridge-parachains = { path = "../../modules/parachains", default-features = false }
-pallet-bridge-relayers = { path = "../../modules/relayers", default-features = false }
-
-# Substrate dependencies
-
-frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
-frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
-pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
-pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
-sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
-sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
-sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
-sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
-sp-trie = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
-
-# Polkadot dependencies
-xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "master" }
-xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "master" }
-
-[dev-dependencies]
-bp-test-utils = { path = "../../primitives/test-utils" }
-pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
-
-[features]
-default = ["std"]
-std = [
- "bp-header-chain/std",
- "bp-messages/std",
- "bp-parachains/std",
- "bp-polkadot-core/std",
- "bp-relayers/std",
- "bp-runtime/std",
- "bp-xcm-bridge-hub-router/std",
- "bp-xcm-bridge-hub/std",
- "codec/std",
- "frame-support/std",
- "frame-system/std",
- "hash-db/std",
- "log/std",
- "pallet-bridge-grandpa/std",
- "pallet-bridge-messages/std",
- "pallet-bridge-parachains/std",
- "pallet-bridge-relayers/std",
- "pallet-transaction-payment/std",
- "pallet-utility/std",
- "scale-info/std",
- "sp-api/std",
- "sp-core/std",
- "sp-io/std",
- "sp-runtime/std",
- "sp-std/std",
- "sp-trie/std",
- "xcm-builder/std",
- "xcm/std",
-]
-runtime-benchmarks = [
- "frame-support/runtime-benchmarks",
- "frame-system/runtime-benchmarks",
- "pallet-balances/runtime-benchmarks",
- "pallet-bridge-grandpa/runtime-benchmarks",
- "pallet-bridge-messages/runtime-benchmarks",
- "pallet-bridge-parachains/runtime-benchmarks",
- "pallet-bridge-relayers/runtime-benchmarks",
- "pallet-utility/runtime-benchmarks",
- "sp-runtime/runtime-benchmarks",
- "xcm-builder/runtime-benchmarks",
-]
-integrity-test = ["static_assertions"]
diff --git a/bin/runtime-common/src/integrity.rs b/bin/runtime-common/src/integrity.rs
deleted file mode 100644
index d3827a14dd6..00000000000
--- a/bin/runtime-common/src/integrity.rs
+++ /dev/null
@@ -1,348 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Parity Bridges Common.
-
-// Parity Bridges Common is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Bridges Common is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Bridges Common. If not, see .
-
-//! Integrity tests for chain constants and pallets configuration.
-//!
-//! Most of the tests in this module assume that the bridge is using standard (see `crate::messages`
-//! module for details) configuration.
-
-use crate::{messages, messages::MessageBridge};
-
-use bp_messages::{InboundLaneData, MessageNonce};
-use bp_runtime::{Chain, ChainId};
-use codec::Encode;
-use frame_support::{storage::generator::StorageValue, traits::Get, weights::Weight};
-use frame_system::limits;
-use pallet_bridge_messages::WeightInfoExt as _;
-
-/// Macro that ensures that the runtime configuration and chain primitives crate are sharing
-/// the same types (nonce, block number, hash, hasher, account id and header).
-#[macro_export]
-macro_rules! assert_chain_types(
- ( runtime: $r:path, this_chain: $this:path ) => {
- {
- // if one of asserts fail, then either bridge isn't configured properly (or alternatively - non-standard
- // configuration is used), or something has broke existing configuration (meaning that all bridged chains
- // and relays will stop functioning)
- use frame_system::{Config as SystemConfig, pallet_prelude::{BlockNumberFor, HeaderFor}};
- use static_assertions::assert_type_eq_all;
-
- assert_type_eq_all!(<$r as SystemConfig>::Nonce, bp_runtime::NonceOf<$this>);
- assert_type_eq_all!(BlockNumberFor<$r>, bp_runtime::BlockNumberOf<$this>);
- assert_type_eq_all!(<$r as SystemConfig>::Hash, bp_runtime::HashOf<$this>);
- assert_type_eq_all!(<$r as SystemConfig>::Hashing, bp_runtime::HasherOf<$this>);
- assert_type_eq_all!(<$r as SystemConfig>::AccountId, bp_runtime::AccountIdOf<$this>);
- assert_type_eq_all!(HeaderFor<$r>, bp_runtime::HeaderOf<$this>);
- }
- }
-);
-
-/// Macro that ensures that the bridge GRANDPA pallet is configured properly to bridge with given
-/// chain.
-#[macro_export]
-macro_rules! assert_bridge_grandpa_pallet_types(
- ( runtime: $r:path, with_bridged_chain_grandpa_instance: $i:path, bridged_chain: $bridged:path ) => {
- {
- // if one of asserts fail, then either bridge isn't configured properly (or alternatively - non-standard
- // configuration is used), or something has broke existing configuration (meaning that all bridged chains
- // and relays will stop functioning)
- use pallet_bridge_grandpa::Config as GrandpaConfig;
- use static_assertions::assert_type_eq_all;
-
- assert_type_eq_all!(<$r as GrandpaConfig<$i>>::BridgedChain, $bridged);
- }
- }
-);
-
-/// Macro that ensures that the bridge messages pallet is configured properly to bridge using given
-/// configuration.
-#[macro_export]
-macro_rules! assert_bridge_messages_pallet_types(
- (
- runtime: $r:path,
- with_bridged_chain_messages_instance: $i:path,
- bridge: $bridge:path
- ) => {
- {
- // if one of asserts fail, then either bridge isn't configured properly (or alternatively - non-standard
- // configuration is used), or something has broke existing configuration (meaning that all bridged chains
- // and relays will stop functioning)
- use $crate::messages::{
- source::{FromThisChainMessagePayload, TargetHeaderChainAdapter},
- target::{FromBridgedChainMessagePayload, SourceHeaderChainAdapter},
- AccountIdOf, BalanceOf, BridgedChain, ThisChain,
- };
- use pallet_bridge_messages::Config as MessagesConfig;
- use static_assertions::assert_type_eq_all;
-
- assert_type_eq_all!(<$r as MessagesConfig<$i>>::OutboundPayload, FromThisChainMessagePayload);
-
- assert_type_eq_all!(<$r as MessagesConfig<$i>>::InboundRelayer, AccountIdOf>);
-
- assert_type_eq_all!(<$r as MessagesConfig<$i>>::TargetHeaderChain, TargetHeaderChainAdapter<$bridge>);
- assert_type_eq_all!(<$r as MessagesConfig<$i>>::SourceHeaderChain, SourceHeaderChainAdapter<$bridge>);
- }
- }
-);
-
-/// Macro that combines four other macro calls - `assert_chain_types`, `assert_bridge_types`,
-/// `assert_bridge_grandpa_pallet_types` and `assert_bridge_messages_pallet_types`. It may be used
-/// at the chain that is implementing complete standard messages bridge (i.e. with bridge GRANDPA
-/// and messages pallets deployed).
-#[macro_export]
-macro_rules! assert_complete_bridge_types(
- (
- runtime: $r:path,
- with_bridged_chain_grandpa_instance: $gi:path,
- with_bridged_chain_messages_instance: $mi:path,
- bridge: $bridge:path,
- this_chain: $this:path,
- bridged_chain: $bridged:path,
- ) => {
- $crate::assert_chain_types!(runtime: $r, this_chain: $this);
- $crate::assert_bridge_grandpa_pallet_types!(
- runtime: $r,
- with_bridged_chain_grandpa_instance: $gi,
- bridged_chain: $bridged
- );
- $crate::assert_bridge_messages_pallet_types!(
- runtime: $r,
- with_bridged_chain_messages_instance: $mi,
- bridge: $bridge
- );
- }
-);
-
-/// Parameters for asserting chain-related constants.
-#[derive(Debug)]
-pub struct AssertChainConstants {
- /// Block length limits of the chain.
- pub block_length: limits::BlockLength,
- /// Block weight limits of the chain.
- pub block_weights: limits::BlockWeights,
-}
-
-/// Test that our hardcoded, chain-related constants, are matching chain runtime configuration.
-///
-/// In particular, this test ensures that:
-///
-/// 1) block weight limits are matching;
-/// 2) block size limits are matching.
-pub fn assert_chain_constants(params: AssertChainConstants)
-where
- R: frame_system::Config,
-{
- // we don't check runtime version here, because in our case we'll be building relay from one
- // repo and runtime will live in another repo, along with outdated relay version. To avoid
- // unneeded commits, let's not raise an error in case of version mismatch.
-
- // if one of following assert fails, it means that we may need to upgrade bridged chain and
- // relay to use updated constants. If constants are now smaller than before, it may lead to
- // undeliverable messages.
-
- // `BlockLength` struct is not implementing `PartialEq`, so we compare encoded values here.
- assert_eq!(
- R::BlockLength::get().encode(),
- params.block_length.encode(),
- "BlockLength from runtime ({:?}) differ from hardcoded: {:?}",
- R::BlockLength::get(),
- params.block_length,
- );
- // `BlockWeights` struct is not implementing `PartialEq`, so we compare encoded values here
- assert_eq!(
- R::BlockWeights::get().encode(),
- params.block_weights.encode(),
- "BlockWeights from runtime ({:?}) differ from hardcoded: {:?}",
- R::BlockWeights::get(),
- params.block_weights,
- );
-}
-
-/// Test that the constants, used in GRANDPA pallet configuration are valid.
-pub fn assert_bridge_grandpa_pallet_constants()
-where
- R: pallet_bridge_grandpa::Config,
- GI: 'static,
-{
- assert!(
- R::HeadersToKeep::get() > 0,
- "HeadersToKeep ({}) must be larger than zero",
- R::HeadersToKeep::get(),
- );
-}
-
-/// Parameters for asserting messages pallet constants.
-#[derive(Debug)]
-pub struct AssertBridgeMessagesPalletConstants {
- /// Maximal number of unrewarded relayer entries in a confirmation transaction at the bridged
- /// chain.
- pub max_unrewarded_relayers_in_bridged_confirmation_tx: MessageNonce,
- /// Maximal number of unconfirmed messages in a confirmation transaction at the bridged chain.
- pub max_unconfirmed_messages_in_bridged_confirmation_tx: MessageNonce,
- /// Identifier of the bridged chain.
- pub bridged_chain_id: ChainId,
-}
-
-/// Test that the constants, used in messages pallet configuration are valid.
-pub fn assert_bridge_messages_pallet_constants(params: AssertBridgeMessagesPalletConstants)
-where
- R: pallet_bridge_messages::Config,
- MI: 'static,
-{
- assert!(
- !R::ActiveOutboundLanes::get().is_empty(),
- "ActiveOutboundLanes ({:?}) must not be empty",
- R::ActiveOutboundLanes::get(),
- );
- assert!(
- R::MaxUnrewardedRelayerEntriesAtInboundLane::get() <= params.max_unrewarded_relayers_in_bridged_confirmation_tx,
- "MaxUnrewardedRelayerEntriesAtInboundLane ({}) must be <= than the hardcoded value for bridged chain: {}",
- R::MaxUnrewardedRelayerEntriesAtInboundLane::get(),
- params.max_unrewarded_relayers_in_bridged_confirmation_tx,
- );
- assert!(
- R::MaxUnconfirmedMessagesAtInboundLane::get() <= params.max_unconfirmed_messages_in_bridged_confirmation_tx,
- "MaxUnrewardedRelayerEntriesAtInboundLane ({}) must be <= than the hardcoded value for bridged chain: {}",
- R::MaxUnconfirmedMessagesAtInboundLane::get(),
- params.max_unconfirmed_messages_in_bridged_confirmation_tx,
- );
- assert_eq!(R::BridgedChainId::get(), params.bridged_chain_id);
-}
-
-/// Parameters for asserting bridge pallet names.
-#[derive(Debug)]
-pub struct AssertBridgePalletNames<'a> {
- /// Name of the messages pallet, deployed at the bridged chain and used to bridge with this
- /// chain.
- pub with_this_chain_messages_pallet_name: &'a str,
- /// Name of the GRANDPA pallet, deployed at this chain and used to bridge with the bridged
- /// chain.
- pub with_bridged_chain_grandpa_pallet_name: &'a str,
- /// Name of the messages pallet, deployed at this chain and used to bridge with the bridged
- /// chain.
- pub with_bridged_chain_messages_pallet_name: &'a str,
-}
-
-/// Tests that bridge pallet names used in `construct_runtime!()` macro call are matching constants
-/// from chain primitives crates.
-pub fn assert_bridge_pallet_names(params: AssertBridgePalletNames)
-where
- B: MessageBridge,
- R: pallet_bridge_grandpa::Config + pallet_bridge_messages::Config,
- GI: 'static,
- MI: 'static,
-{
- assert_eq!(B::BRIDGED_MESSAGES_PALLET_NAME, params.with_this_chain_messages_pallet_name);
- assert_eq!(
- pallet_bridge_grandpa::PalletOwner::::storage_value_final_key().to_vec(),
- bp_runtime::storage_value_key(params.with_bridged_chain_grandpa_pallet_name, "PalletOwner",).0,
- );
- assert_eq!(
- pallet_bridge_messages::PalletOwner::::storage_value_final_key().to_vec(),
- bp_runtime::storage_value_key(
- params.with_bridged_chain_messages_pallet_name,
- "PalletOwner",
- )
- .0,
- );
-}
-
-/// Parameters for asserting complete standard messages bridge.
-#[derive(Debug)]
-pub struct AssertCompleteBridgeConstants<'a> {
- /// Parameters to assert this chain constants.
- pub this_chain_constants: AssertChainConstants,
- /// Parameters to assert messages pallet constants.
- pub messages_pallet_constants: AssertBridgeMessagesPalletConstants,
- /// Parameters to assert pallet names constants.
- pub pallet_names: AssertBridgePalletNames<'a>,
-}
-
-/// All bridge-related constants tests for the complete standard messages bridge (i.e. with bridge
-/// GRANDPA and messages pallets deployed).
-pub fn assert_complete_bridge_constants(params: AssertCompleteBridgeConstants)
-where
- R: frame_system::Config
- + pallet_bridge_grandpa::Config
- + pallet_bridge_messages::Config,
- GI: 'static,
- MI: 'static,
- B: MessageBridge,
-{
- assert_chain_constants::(params.this_chain_constants);
- assert_bridge_grandpa_pallet_constants::();
- assert_bridge_messages_pallet_constants::(params.messages_pallet_constants);
- assert_bridge_pallet_names::(params.pallet_names);
-}
-
-/// Check that the message lane weights are correct.
-pub fn check_message_lane_weights<
- C: Chain,
- T: frame_system::Config + pallet_bridge_messages::Config,
- MessagesPalletInstance: 'static,
->(
- bridged_chain_extra_storage_proof_size: u32,
- this_chain_max_unrewarded_relayers: MessageNonce,
- this_chain_max_unconfirmed_messages: MessageNonce,
- // whether `RefundBridgedParachainMessages` extension is deployed at runtime and is used for
- // refunding this bridge transactions?
- //
- // in other words: pass true for all known production chains
- runtime_includes_refund_extension: bool,
-) {
- type Weights = >::WeightInfo;
-
- // check basic weight assumptions
- pallet_bridge_messages::ensure_weights_are_correct::>();
-
- // check that weights allow us to receive messages
- let max_incoming_message_proof_size = bridged_chain_extra_storage_proof_size
- .saturating_add(messages::target::maximal_incoming_message_size(C::max_extrinsic_size()));
- pallet_bridge_messages::ensure_able_to_receive_message::>(
- C::max_extrinsic_size(),
- C::max_extrinsic_weight(),
- max_incoming_message_proof_size,
- messages::target::maximal_incoming_message_dispatch_weight(C::max_extrinsic_weight()),
- );
-
- // check that weights allow us to receive delivery confirmations
- let max_incoming_inbound_lane_data_proof_size =
- InboundLaneData::<()>::encoded_size_hint_u32(this_chain_max_unrewarded_relayers as _);
- pallet_bridge_messages::ensure_able_to_receive_confirmation::>(
- C::max_extrinsic_size(),
- C::max_extrinsic_weight(),
- max_incoming_inbound_lane_data_proof_size,
- this_chain_max_unrewarded_relayers,
- this_chain_max_unconfirmed_messages,
- );
-
- // check that extra weights of delivery/confirmation transactions include the weight
- // of `RefundBridgedParachainMessages` operations. This signed extension assumes the worst case
- // (i.e. slashing if delivery transaction was invalid) and refunds some weight if
- // assumption was wrong (i.e. if we did refund instead of slashing). This check
- // ensures the extension will not refund weight when it doesn't need to (i.e. if pallet
- // weights do not account weights of refund extension).
- if runtime_includes_refund_extension {
- assert_ne!(
- Weights::::receive_messages_proof_overhead_from_runtime(),
- Weight::zero()
- );
- assert_ne!(
- Weights::::receive_messages_delivery_proof_overhead_from_runtime(),
- Weight::zero()
- );
- }
-}
diff --git a/bin/runtime-common/src/lib.rs b/bin/runtime-common/src/lib.rs
deleted file mode 100644
index 2722f6f1c6d..00000000000
--- a/bin/runtime-common/src/lib.rs
+++ /dev/null
@@ -1,223 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Parity Bridges Common.
-
-// Parity Bridges Common is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Bridges Common is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Bridges Common. If not, see .
-
-//! Common types/functions that may be used by runtimes of all bridged chains.
-
-#![warn(missing_docs)]
-#![cfg_attr(not(feature = "std"), no_std)]
-
-use crate::messages_call_ext::MessagesCallSubType;
-use pallet_bridge_grandpa::CallSubType as GrandpaCallSubType;
-use pallet_bridge_parachains::CallSubType as ParachainsCallSubtype;
-use sp_runtime::transaction_validity::TransactionValidity;
-
-pub mod messages;
-pub mod messages_api;
-pub mod messages_benchmarking;
-pub mod messages_call_ext;
-pub mod messages_generation;
-pub mod messages_xcm_extension;
-pub mod parachains_benchmarking;
-pub mod priority_calculator;
-pub mod refund_relayer_extension;
-
-mod mock;
-
-#[cfg(feature = "integrity-test")]
-pub mod integrity;
-
-const LOG_TARGET_BRIDGE_DISPATCH: &str = "runtime::bridge-dispatch";
-
-/// A duplication of the `FilterCall` trait.
-///
-/// We need this trait in order to be able to implement it for the messages pallet,
-/// since the implementation is done outside of the pallet crate.
-pub trait BridgeRuntimeFilterCall {
- /// Checks if a runtime call is valid.
- fn validate(call: &Call) -> TransactionValidity;
-}
-
-impl BridgeRuntimeFilterCall for pallet_bridge_grandpa::Pallet
-where
- T: pallet_bridge_grandpa::Config,
- T::RuntimeCall: GrandpaCallSubType,
-{
- fn validate(call: &T::RuntimeCall) -> TransactionValidity {
- GrandpaCallSubType::::check_obsolete_submit_finality_proof(call)
- }
-}
-
-impl BridgeRuntimeFilterCall
- for pallet_bridge_parachains::Pallet
-where
- T: pallet_bridge_parachains::Config,
- T::RuntimeCall: ParachainsCallSubtype,
-{
- fn validate(call: &T::RuntimeCall) -> TransactionValidity {
- ParachainsCallSubtype::::check_obsolete_submit_parachain_heads(call)
- }
-}
-
-impl, I: 'static> BridgeRuntimeFilterCall
- for pallet_bridge_messages::Pallet
-where
- T::RuntimeCall: MessagesCallSubType,
-{
- /// Validate messages in order to avoid "mining" messages delivery and delivery confirmation
- /// transactions, that are delivering outdated messages/confirmations. Without this validation,
- /// even honest relayers may lose their funds if there are multiple relays running and
- /// submitting the same messages/confirmations.
- fn validate(call: &T::RuntimeCall) -> TransactionValidity {
- call.check_obsolete_call()
- }
-}
-
-/// Declares a runtime-specific `BridgeRejectObsoleteHeadersAndMessages` signed extension.
-///
-/// ## Example
-///
-/// ```nocompile
-/// generate_bridge_reject_obsolete_headers_and_messages!{
-/// Call, AccountId
-/// BridgeRococoGrandpa, BridgeRococoMessages,
-/// BridgeRococoParachains
-/// }
-/// ```
-///
-/// The goal of this extension is to avoid "mining" transactions that provide outdated bridged
-/// headers and messages. Without that extension, even honest relayers may lose their funds if
-/// there are multiple relays running and submitting the same information.
-#[macro_export]
-macro_rules! generate_bridge_reject_obsolete_headers_and_messages {
- ($call:ty, $account_id:ty, $($filter_call:ty),*) => {
- #[derive(Clone, codec::Decode, Default, codec::Encode, Eq, PartialEq, sp_runtime::RuntimeDebug, scale_info::TypeInfo)]
- pub struct BridgeRejectObsoleteHeadersAndMessages;
- impl sp_runtime::traits::SignedExtension for BridgeRejectObsoleteHeadersAndMessages {
- const IDENTIFIER: &'static str = "BridgeRejectObsoleteHeadersAndMessages";
- type AccountId = $account_id;
- type Call = $call;
- type AdditionalSigned = ();
- type Pre = ();
-
- fn additional_signed(&self) -> sp_std::result::Result<
- (),
- sp_runtime::transaction_validity::TransactionValidityError,
- > {
- Ok(())
- }
-
- fn validate(
- &self,
- _who: &Self::AccountId,
- call: &Self::Call,
- _info: &sp_runtime::traits::DispatchInfoOf,
- _len: usize,
- ) -> sp_runtime::transaction_validity::TransactionValidity {
- let valid = sp_runtime::transaction_validity::ValidTransaction::default();
- $(
- let valid = valid
- .combine_with(<$filter_call as $crate::BridgeRuntimeFilterCall<$call>>::validate(call)?);
- )*
- Ok(valid)
- }
-
- fn pre_dispatch(
- self,
- who: &Self::AccountId,
- call: &Self::Call,
- info: &sp_runtime::traits::DispatchInfoOf,
- len: usize,
- ) -> Result {
- self.validate(who, call, info, len).map(drop)
- }
- }
- };
-}
-
-#[cfg(test)]
-mod tests {
- use crate::BridgeRuntimeFilterCall;
- use frame_support::{assert_err, assert_ok};
- use sp_runtime::{
- traits::SignedExtension,
- transaction_validity::{InvalidTransaction, TransactionValidity, ValidTransaction},
- };
-
- pub struct MockCall {
- data: u32,
- }
-
- impl sp_runtime::traits::Dispatchable for MockCall {
- type RuntimeOrigin = ();
- type Config = ();
- type Info = ();
- type PostInfo = ();
-
- fn dispatch(
- self,
- _origin: Self::RuntimeOrigin,
- ) -> sp_runtime::DispatchResultWithInfo {
- unimplemented!()
- }
- }
-
- struct FirstFilterCall;
- impl BridgeRuntimeFilterCall for FirstFilterCall {
- fn validate(call: &MockCall) -> TransactionValidity {
- if call.data <= 1 {
- return InvalidTransaction::Custom(1).into()
- }
-
- Ok(ValidTransaction { priority: 1, ..Default::default() })
- }
- }
-
- struct SecondFilterCall;
- impl BridgeRuntimeFilterCall for SecondFilterCall {
- fn validate(call: &MockCall) -> TransactionValidity {
- if call.data <= 2 {
- return InvalidTransaction::Custom(2).into()
- }
-
- Ok(ValidTransaction { priority: 2, ..Default::default() })
- }
- }
-
- #[test]
- fn test() {
- generate_bridge_reject_obsolete_headers_and_messages!(
- MockCall,
- (),
- FirstFilterCall,
- SecondFilterCall
- );
-
- assert_err!(
- BridgeRejectObsoleteHeadersAndMessages.validate(&(), &MockCall { data: 1 }, &(), 0),
- InvalidTransaction::Custom(1)
- );
-
- assert_err!(
- BridgeRejectObsoleteHeadersAndMessages.validate(&(), &MockCall { data: 2 }, &(), 0),
- InvalidTransaction::Custom(2)
- );
-
- assert_ok!(
- BridgeRejectObsoleteHeadersAndMessages.validate(&(), &MockCall { data: 3 }, &(), 0),
- ValidTransaction { priority: 3, ..Default::default() }
- )
- }
-}
diff --git a/bin/runtime-common/src/messages.rs b/bin/runtime-common/src/messages.rs
deleted file mode 100644
index 4aca53f3b98..00000000000
--- a/bin/runtime-common/src/messages.rs
+++ /dev/null
@@ -1,701 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Parity Bridges Common.
-
-// Parity Bridges Common is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Bridges Common is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Bridges Common. If not, see .
-
-//! Types that allow runtime to act as a source/target endpoint of message lanes.
-//!
-//! Messages are assumed to be encoded `Call`s of the target chain. Call-dispatch
-//! pallet is used to dispatch incoming messages. Message identified by a tuple
-//! of to elements - message lane id and message nonce.
-
-pub use bp_runtime::{RangeInclusiveExt, UnderlyingChainOf, UnderlyingChainProvider};
-
-use bp_header_chain::HeaderChain;
-use bp_messages::{
- source_chain::TargetHeaderChain,
- target_chain::{ProvedLaneMessages, ProvedMessages, SourceHeaderChain},
- InboundLaneData, LaneId, Message, MessageKey, MessageNonce, MessagePayload, OutboundLaneData,
- VerificationError,
-};
-use bp_runtime::{Chain, RawStorageProof, Size, StorageProofChecker};
-use codec::{Decode, Encode};
-use frame_support::{traits::Get, weights::Weight};
-use hash_db::Hasher;
-use scale_info::TypeInfo;
-use sp_runtime::RuntimeDebug;
-use sp_std::{convert::TryFrom, marker::PhantomData, vec::Vec};
-
-/// Bidirectional message bridge.
-pub trait MessageBridge {
- /// Name of the paired messages pallet instance at the Bridged chain.
- ///
- /// Should be the name that is used in the `construct_runtime!()` macro.
- const BRIDGED_MESSAGES_PALLET_NAME: &'static str;
-
- /// This chain in context of message bridge.
- type ThisChain: ThisChainWithMessages;
- /// Bridged chain in context of message bridge.
- type BridgedChain: BridgedChainWithMessages;
- /// Bridged header chain.
- type BridgedHeaderChain: HeaderChain>;
-}
-
-/// This chain that has `pallet-bridge-messages` module.
-pub trait ThisChainWithMessages: UnderlyingChainProvider {
- /// Call origin on the chain.
- type RuntimeOrigin;
-}
-
-/// Bridged chain that has `pallet-bridge-messages` module.
-pub trait BridgedChainWithMessages: UnderlyingChainProvider {}
-
-/// This chain in context of message bridge.
-pub type ThisChain = ::ThisChain;
-/// Bridged chain in context of message bridge.
-pub type BridgedChain = ::BridgedChain;
-/// Hash used on the chain.
-pub type HashOf = bp_runtime::HashOf<::Chain>;
-/// Hasher used on the chain.
-pub type HasherOf = bp_runtime::HasherOf>;
-/// Account id used on the chain.
-pub type AccountIdOf = bp_runtime::AccountIdOf>;
-/// Type of balances that is used on the chain.
-pub type BalanceOf = bp_runtime::BalanceOf>;
-
-/// Sub-module that is declaring types required for processing This -> Bridged chain messages.
-pub mod source {
- use super::*;
-
- /// Message payload for This -> Bridged chain messages.
- pub type FromThisChainMessagePayload = crate::messages_xcm_extension::XcmAsPlainPayload;
-
- /// Maximal size of outbound message payload.
- pub struct FromThisChainMaximalOutboundPayloadSize(PhantomData);
-
- impl Get for FromThisChainMaximalOutboundPayloadSize {
- fn get() -> u32 {
- maximal_message_size::()
- }
- }
-
- /// Messages delivery proof from bridged chain:
- ///
- /// - hash of finalized header;
- /// - storage proof of inbound lane state;
- /// - lane id.
- #[derive(Clone, Decode, Encode, Eq, PartialEq, RuntimeDebug, TypeInfo)]
- pub struct FromBridgedChainMessagesDeliveryProof {
- /// Hash of the bridge header the proof is for.
- pub bridged_header_hash: BridgedHeaderHash,
- /// Storage trie proof generated for [`Self::bridged_header_hash`].
- pub storage_proof: RawStorageProof,
- /// Lane id of which messages were delivered and the proof is for.
- pub lane: LaneId,
- }
-
- impl Size for FromBridgedChainMessagesDeliveryProof {
- fn size(&self) -> u32 {
- u32::try_from(
- self.storage_proof
- .iter()
- .fold(0usize, |sum, node| sum.saturating_add(node.len())),
- )
- .unwrap_or(u32::MAX)
- }
- }
-
- /// 'Parsed' message delivery proof - inbound lane id and its state.
- pub type ParsedMessagesDeliveryProofFromBridgedChain =
- (LaneId, InboundLaneData>>);
-
- /// Return maximal message size of This -> Bridged chain message.
- pub fn maximal_message_size() -> u32 {
- super::target::maximal_incoming_message_size(
- UnderlyingChainOf::>::max_extrinsic_size(),
- )
- }
-
- /// `TargetHeaderChain` implementation that is using default types and perform default checks.
- pub struct TargetHeaderChainAdapter(PhantomData);
-
- impl TargetHeaderChain>>
- for TargetHeaderChainAdapter
- {
- type MessagesDeliveryProof = FromBridgedChainMessagesDeliveryProof>>;
-
- fn verify_message(payload: &FromThisChainMessagePayload) -> Result<(), VerificationError> {
- verify_chain_message::(payload)
- }
-
- fn verify_messages_delivery_proof(
- proof: Self::MessagesDeliveryProof,
- ) -> Result<(LaneId, InboundLaneData>>), VerificationError> {
- verify_messages_delivery_proof::(proof)
- }
- }
-
- /// Do basic Bridged-chain specific verification of This -> Bridged chain message.
- ///
- /// Ok result from this function means that the delivery transaction with this message
- /// may be 'mined' by the target chain.
- pub fn verify_chain_message(
- payload: &FromThisChainMessagePayload,
- ) -> Result<(), VerificationError> {
- // IMPORTANT: any error that is returned here is fatal for the bridge, because
- // this code is executed at the bridge hub and message sender actually lives
- // at some sibling parachain. So we are failing **after** the message has been
- // sent and we can't report it back to sender (unless error report mechanism is
- // embedded into message and its dispatcher).
-
- // apart from maximal message size check (see below), we should also check the message
- // dispatch weight here. But we assume that the bridged chain will just push the message
- // to some queue (XCMP, UMP, DMP), so the weight is constant and fits the block.
-
- // The maximal size of extrinsic at Substrate-based chain depends on the
- // `frame_system::Config::MaximumBlockLength` and
- // `frame_system::Config::AvailableBlockRatio` constants. This check is here to be sure that
- // the lane won't stuck because message is too large to fit into delivery transaction.
- //
- // **IMPORTANT NOTE**: the delivery transaction contains storage proof of the message, not
- // the message itself. The proof is always larger than the message. But unless chain state
- // is enormously large, it should be several dozens/hundreds of bytes. The delivery
- // transaction also contains signatures and signed extensions. Because of this, we reserve
- // 1/3 of the the maximal extrinsic size for this data.
- if payload.len() > maximal_message_size::() as usize {
- return Err(VerificationError::MessageTooLarge)
- }
-
- Ok(())
- }
-
- /// Verify proof of This -> Bridged chain messages delivery.
- ///
- /// This function is used when Bridged chain is directly using GRANDPA finality. For Bridged
- /// parachains, please use the `verify_messages_delivery_proof_from_parachain`.
- pub fn verify_messages_delivery_proof(
- proof: FromBridgedChainMessagesDeliveryProof>>,
- ) -> Result, VerificationError> {
- let FromBridgedChainMessagesDeliveryProof { bridged_header_hash, storage_proof, lane } =
- proof;
- let mut storage =
- B::BridgedHeaderChain::storage_proof_checker(bridged_header_hash, storage_proof)
- .map_err(VerificationError::HeaderChain)?;
- // Messages delivery proof is just proof of single storage key read => any error
- // is fatal.
- let storage_inbound_lane_data_key = bp_messages::storage_keys::inbound_lane_data_key(
- B::BRIDGED_MESSAGES_PALLET_NAME,
- &lane,
- );
- let inbound_lane_data = storage
- .read_and_decode_mandatory_value(storage_inbound_lane_data_key.0.as_ref())
- .map_err(VerificationError::InboundLaneStorage)?;
-
- // check that the storage proof doesn't have any untouched trie nodes
- storage.ensure_no_unused_nodes().map_err(VerificationError::StorageProof)?;
-
- Ok((lane, inbound_lane_data))
- }
-}
-
-/// Sub-module that is declaring types required for processing Bridged -> This chain messages.
-pub mod target {
- use super::*;
-
- /// Decoded Bridged -> This message payload.
- pub type FromBridgedChainMessagePayload = crate::messages_xcm_extension::XcmAsPlainPayload;
-
- /// Messages proof from bridged chain:
- ///
- /// - hash of finalized header;
- /// - storage proof of messages and (optionally) outbound lane state;
- /// - lane id;
- /// - nonces (inclusive range) of messages which are included in this proof.
- #[derive(Clone, Decode, Encode, Eq, PartialEq, RuntimeDebug, TypeInfo)]
- pub struct FromBridgedChainMessagesProof {
- /// Hash of the finalized bridged header the proof is for.
- pub bridged_header_hash: BridgedHeaderHash,
- /// A storage trie proof of messages being delivered.
- pub storage_proof: RawStorageProof,
- /// Messages in this proof are sent over this lane.
- pub lane: LaneId,
- /// Nonce of the first message being delivered.
- pub nonces_start: MessageNonce,
- /// Nonce of the last message being delivered.
- pub nonces_end: MessageNonce,
- }
-
- impl Size for FromBridgedChainMessagesProof {
- fn size(&self) -> u32 {
- u32::try_from(
- self.storage_proof
- .iter()
- .fold(0usize, |sum, node| sum.saturating_add(node.len())),
- )
- .unwrap_or(u32::MAX)
- }
- }
-
- /// Return maximal dispatch weight of the message we're able to receive.
- pub fn maximal_incoming_message_dispatch_weight(maximal_extrinsic_weight: Weight) -> Weight {
- maximal_extrinsic_weight / 2
- }
-
- /// Return maximal message size given maximal extrinsic size.
- pub fn maximal_incoming_message_size(maximal_extrinsic_size: u32) -> u32 {
- maximal_extrinsic_size / 3 * 2
- }
-
- /// `SourceHeaderChain` implementation that is using default types and perform default checks.
- pub struct SourceHeaderChainAdapter(PhantomData);
-
- impl SourceHeaderChain for SourceHeaderChainAdapter {
- type MessagesProof = FromBridgedChainMessagesProof>>;
-
- fn verify_messages_proof(
- proof: Self::MessagesProof,
- messages_count: u32,
- ) -> Result, VerificationError> {
- verify_messages_proof::(proof, messages_count)
- }
- }
-
- /// Verify proof of Bridged -> This chain messages.
- ///
- /// This function is used when Bridged chain is directly using GRANDPA finality. For Bridged
- /// parachains, please use the `verify_messages_proof_from_parachain`.
- ///
- /// The `messages_count` argument verification (sane limits) is supposed to be made
- /// outside of this function. This function only verifies that the proof declares exactly
- /// `messages_count` messages.
- pub fn verify_messages_proof(
- proof: FromBridgedChainMessagesProof>>,
- messages_count: u32,
- ) -> Result, VerificationError> {
- let FromBridgedChainMessagesProof {
- bridged_header_hash,
- storage_proof,
- lane,
- nonces_start,
- nonces_end,
- } = proof;
- let storage =
- B::BridgedHeaderChain::storage_proof_checker(bridged_header_hash, storage_proof)
- .map_err(VerificationError::HeaderChain)?;
- let mut parser = StorageProofCheckerAdapter::<_, B> { storage, _dummy: Default::default() };
- let nonces_range = nonces_start..=nonces_end;
-
- // receiving proofs where end < begin is ok (if proof includes outbound lane state)
- let messages_in_the_proof = nonces_range.checked_len().unwrap_or(0);
- if messages_in_the_proof != MessageNonce::from(messages_count) {
- return Err(VerificationError::MessagesCountMismatch)
- }
-
- // Read messages first. All messages that are claimed to be in the proof must
- // be in the proof. So any error in `read_value`, or even missing value is fatal.
- //
- // Mind that we allow proofs with no messages if outbound lane state is proved.
- let mut messages = Vec::with_capacity(messages_in_the_proof as _);
- for nonce in nonces_range {
- let message_key = MessageKey { lane_id: lane, nonce };
- let message_payload = parser.read_and_decode_message_payload(&message_key)?;
- messages.push(Message { key: message_key, payload: message_payload });
- }
-
- // Now let's check if proof contains outbound lane state proof. It is optional, so
- // we simply ignore `read_value` errors and missing value.
- let proved_lane_messages = ProvedLaneMessages {
- lane_state: parser.read_and_decode_outbound_lane_data(&lane)?,
- messages,
- };
-
- // Now we may actually check if the proof is empty or not.
- if proved_lane_messages.lane_state.is_none() && proved_lane_messages.messages.is_empty() {
- return Err(VerificationError::EmptyMessageProof)
- }
-
- // check that the storage proof doesn't have any untouched trie nodes
- parser
- .storage
- .ensure_no_unused_nodes()
- .map_err(VerificationError::StorageProof)?;
-
- // We only support single lane messages in this generated_schema
- let mut proved_messages = ProvedMessages::new();
- proved_messages.insert(lane, proved_lane_messages);
-
- Ok(proved_messages)
- }
-
- struct StorageProofCheckerAdapter {
- storage: StorageProofChecker,
- _dummy: sp_std::marker::PhantomData,
- }
-
- impl StorageProofCheckerAdapter {
- fn read_and_decode_outbound_lane_data(
- &mut self,
- lane_id: &LaneId,
- ) -> Result, VerificationError> {
- let storage_outbound_lane_data_key = bp_messages::storage_keys::outbound_lane_data_key(
- B::BRIDGED_MESSAGES_PALLET_NAME,
- lane_id,
- );
-
- self.storage
- .read_and_decode_opt_value(storage_outbound_lane_data_key.0.as_ref())
- .map_err(VerificationError::OutboundLaneStorage)
- }
-
- fn read_and_decode_message_payload(
- &mut self,
- message_key: &MessageKey,
- ) -> Result {
- let storage_message_key = bp_messages::storage_keys::message_key(
- B::BRIDGED_MESSAGES_PALLET_NAME,
- &message_key.lane_id,
- message_key.nonce,
- );
- self.storage
- .read_and_decode_mandatory_value(storage_message_key.0.as_ref())
- .map_err(VerificationError::MessageStorage)
- }
- }
-}
-
-/// The `BridgeMessagesCall` used by a chain.
-pub type BridgeMessagesCallOf = bp_messages::BridgeMessagesCall<
- bp_runtime::AccountIdOf,
- target::FromBridgedChainMessagesProof>,
- source::FromBridgedChainMessagesDeliveryProof>,
->;
-
-#[cfg(test)]
-mod tests {
- use super::*;
- use crate::{
- messages_generation::{
- encode_all_messages, encode_lane_data, prepare_messages_storage_proof,
- },
- mock::*,
- };
- use bp_header_chain::{HeaderChainError, StoredHeaderDataBuilder};
- use bp_runtime::{HeaderId, StorageProofError};
- use codec::Encode;
- use sp_core::H256;
- use sp_runtime::traits::Header as _;
-
- #[test]
- fn verify_chain_message_rejects_message_with_too_large_declared_weight() {
- assert!(source::verify_chain_message::(&vec![
- 42;
- BRIDGED_CHAIN_MAX_EXTRINSIC_WEIGHT -
- 1
- ])
- .is_err());
- }
-
- #[test]
- fn verify_chain_message_rejects_message_too_large_message() {
- assert!(source::verify_chain_message::(&vec![
- 0;
- source::maximal_message_size::()
- as usize + 1
- ],)
- .is_err());
- }
-
- #[test]
- fn verify_chain_message_accepts_maximal_message() {
- assert_eq!(
- source::verify_chain_message::(&vec![
- 0;
- source::maximal_message_size::()
- as _
- ],),
- Ok(()),
- );
- }
-
- fn using_messages_proof(
- nonces_end: MessageNonce,
- outbound_lane_data: Option,
- encode_message: impl Fn(MessageNonce, &MessagePayload) -> Option>,
- encode_outbound_lane_data: impl Fn(&OutboundLaneData) -> Vec,
- test: impl Fn(target::FromBridgedChainMessagesProof) -> R,
- ) -> R {
- let (state_root, storage_proof) = prepare_messages_storage_proof::(
- TEST_LANE_ID,
- 1..=nonces_end,
- outbound_lane_data,
- bp_runtime::StorageProofSize::Minimal(0),
- vec![42],
- encode_message,
- encode_outbound_lane_data,
- );
-
- sp_io::TestExternalities::new(Default::default()).execute_with(move || {
- let bridged_header = BridgedChainHeader::new(
- 0,
- Default::default(),
- state_root,
- Default::default(),
- Default::default(),
- );
- let bridged_header_hash = bridged_header.hash();
-
- pallet_bridge_grandpa::BestFinalized::::put(HeaderId(
- 0,
- bridged_header_hash,
- ));
- pallet_bridge_grandpa::ImportedHeaders::::insert(
- bridged_header_hash,
- bridged_header.build(),
- );
- test(target::FromBridgedChainMessagesProof {
- bridged_header_hash,
- storage_proof,
- lane: TEST_LANE_ID,
- nonces_start: 1,
- nonces_end,
- })
- })
- }
-
- #[test]
- fn messages_proof_is_rejected_if_declared_less_than_actual_number_of_messages() {
- assert_eq!(
- using_messages_proof(10, None, encode_all_messages, encode_lane_data, |proof| {
- target::verify_messages_proof::(proof, 5)
- }),
- Err(VerificationError::MessagesCountMismatch),
- );
- }
-
- #[test]
- fn messages_proof_is_rejected_if_declared_more_than_actual_number_of_messages() {
- assert_eq!(
- using_messages_proof(10, None, encode_all_messages, encode_lane_data, |proof| {
- target::verify_messages_proof::(proof, 15)
- }),
- Err(VerificationError::MessagesCountMismatch),
- );
- }
-
- #[test]
- fn message_proof_is_rejected_if_header_is_missing_from_the_chain() {
- assert_eq!(
- using_messages_proof(10, None, encode_all_messages, encode_lane_data, |proof| {
- let bridged_header_hash =
- pallet_bridge_grandpa::BestFinalized::::get().unwrap().1;
- pallet_bridge_grandpa::ImportedHeaders::::remove(bridged_header_hash);
- target::verify_messages_proof::(proof, 10)
- }),
- Err(VerificationError::HeaderChain(HeaderChainError::UnknownHeader)),
- );
- }
-
- #[test]
- fn message_proof_is_rejected_if_header_state_root_mismatches() {
- assert_eq!(
- using_messages_proof(10, None, encode_all_messages, encode_lane_data, |proof| {
- let bridged_header_hash =
- pallet_bridge_grandpa::BestFinalized::::get().unwrap().1;
- pallet_bridge_grandpa::ImportedHeaders::::insert(
- bridged_header_hash,
- BridgedChainHeader::new(
- 0,
- Default::default(),
- Default::default(),
- Default::default(),
- Default::default(),
- )
- .build(),
- );
- target::verify_messages_proof::(proof, 10)
- }),
- Err(VerificationError::HeaderChain(HeaderChainError::StorageProof(
- StorageProofError::StorageRootMismatch
- ))),
- );
- }
-
- #[test]
- fn message_proof_is_rejected_if_it_has_duplicate_trie_nodes() {
- assert_eq!(
- using_messages_proof(10, None, encode_all_messages, encode_lane_data, |mut proof| {
- let node = proof.storage_proof.pop().unwrap();
- proof.storage_proof.push(node.clone());
- proof.storage_proof.push(node);
- target::verify_messages_proof::(proof, 10)
- },),
- Err(VerificationError::HeaderChain(HeaderChainError::StorageProof(
- StorageProofError::DuplicateNodesInProof
- ))),
- );
- }
-
- #[test]
- fn message_proof_is_rejected_if_it_has_unused_trie_nodes() {
- assert_eq!(
- using_messages_proof(10, None, encode_all_messages, encode_lane_data, |mut proof| {
- proof.storage_proof.push(vec![42]);
- target::verify_messages_proof::(proof, 10)
- },),
- Err(VerificationError::StorageProof(StorageProofError::UnusedNodesInTheProof)),
- );
- }
-
- #[test]
- fn message_proof_is_rejected_if_required_message_is_missing() {
- matches!(
- using_messages_proof(
- 10,
- None,
- |n, m| if n != 5 { Some(m.encode()) } else { None },
- encode_lane_data,
- |proof| target::verify_messages_proof::(proof, 10)
- ),
- Err(VerificationError::MessageStorage(StorageProofError::StorageValueEmpty)),
- );
- }
-
- #[test]
- fn message_proof_is_rejected_if_message_decode_fails() {
- matches!(
- using_messages_proof(
- 10,
- None,
- |n, m| {
- let mut m = m.encode();
- if n == 5 {
- m = vec![42]
- }
- Some(m)
- },
- encode_lane_data,
- |proof| target::verify_messages_proof::(proof, 10),
- ),
- Err(VerificationError::MessageStorage(StorageProofError::StorageValueDecodeFailed(_))),
- );
- }
-
- #[test]
- fn message_proof_is_rejected_if_outbound_lane_state_decode_fails() {
- matches!(
- using_messages_proof(
- 10,
- Some(OutboundLaneData {
- oldest_unpruned_nonce: 1,
- latest_received_nonce: 1,
- latest_generated_nonce: 1,
- }),
- encode_all_messages,
- |d| {
- let mut d = d.encode();
- d.truncate(1);
- d
- },
- |proof| target::verify_messages_proof::(proof, 10),
- ),
- Err(VerificationError::OutboundLaneStorage(
- StorageProofError::StorageValueDecodeFailed(_)
- )),
- );
- }
-
- #[test]
- fn message_proof_is_rejected_if_it_is_empty() {
- assert_eq!(
- using_messages_proof(0, None, encode_all_messages, encode_lane_data, |proof| {
- target::verify_messages_proof::(proof, 0)
- },),
- Err(VerificationError::EmptyMessageProof),
- );
- }
-
- #[test]
- fn non_empty_message_proof_without_messages_is_accepted() {
- assert_eq!(
- using_messages_proof(
- 0,
- Some(OutboundLaneData {
- oldest_unpruned_nonce: 1,
- latest_received_nonce: 1,
- latest_generated_nonce: 1,
- }),
- encode_all_messages,
- encode_lane_data,
- |proof| target::verify_messages_proof::(proof, 0),
- ),
- Ok(vec![(
- TEST_LANE_ID,
- ProvedLaneMessages {
- lane_state: Some(OutboundLaneData {
- oldest_unpruned_nonce: 1,
- latest_received_nonce: 1,
- latest_generated_nonce: 1,
- }),
- messages: Vec::new(),
- },
- )]
- .into_iter()
- .collect()),
- );
- }
-
- #[test]
- fn non_empty_message_proof_is_accepted() {
- assert_eq!(
- using_messages_proof(
- 1,
- Some(OutboundLaneData {
- oldest_unpruned_nonce: 1,
- latest_received_nonce: 1,
- latest_generated_nonce: 1,
- }),
- encode_all_messages,
- encode_lane_data,
- |proof| target::verify_messages_proof::(proof, 1),
- ),
- Ok(vec![(
- TEST_LANE_ID,
- ProvedLaneMessages {
- lane_state: Some(OutboundLaneData {
- oldest_unpruned_nonce: 1,
- latest_received_nonce: 1,
- latest_generated_nonce: 1,
- }),
- messages: vec![Message {
- key: MessageKey { lane_id: TEST_LANE_ID, nonce: 1 },
- payload: vec![42],
- }],
- },
- )]
- .into_iter()
- .collect()),
- );
- }
-
- #[test]
- fn verify_messages_proof_does_not_panic_if_messages_count_mismatches() {
- assert_eq!(
- using_messages_proof(1, None, encode_all_messages, encode_lane_data, |mut proof| {
- proof.nonces_end = u64::MAX;
- target::verify_messages_proof::(proof, u32::MAX)
- },),
- Err(VerificationError::MessagesCountMismatch),
- );
- }
-}
diff --git a/bin/runtime-common/src/messages_api.rs b/bin/runtime-common/src/messages_api.rs
deleted file mode 100644
index 7fbdeb36612..00000000000
--- a/bin/runtime-common/src/messages_api.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Parity Bridges Common.
-
-// Parity Bridges Common is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Bridges Common is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Bridges Common. If not, see .
-
-//! Helpers for implementing various message-related runtime API methods.
-
-use bp_messages::{
- InboundMessageDetails, LaneId, MessageNonce, MessagePayload, OutboundMessageDetails,
-};
-use sp_std::vec::Vec;
-
-/// Implementation of the `To*OutboundLaneApi::message_details`.
-pub fn outbound_message_details(
- lane: LaneId,
- begin: MessageNonce,
- end: MessageNonce,
-) -> Vec
-where
- Runtime: pallet_bridge_messages::Config,
- MessagesPalletInstance: 'static,
-{
- (begin..=end)
- .filter_map(|nonce| {
- let message_data =
- pallet_bridge_messages::Pallet::::outbound_message_data(lane, nonce)?;
- Some(OutboundMessageDetails {
- nonce,
- // dispatch message weight is always zero at the source chain, since we're paying for
- // dispatch at the target chain
- dispatch_weight: frame_support::weights::Weight::zero(),
- size: message_data.len() as _,
- })
- })
- .collect()
-}
-
-/// Implementation of the `To*InboundLaneApi::message_details`.
-pub fn inbound_message_details(
- lane: LaneId,
- messages: Vec<(MessagePayload, OutboundMessageDetails)>,
-) -> Vec
-where
- Runtime: pallet_bridge_messages::Config,
- MessagesPalletInstance: 'static,
-{
- messages
- .into_iter()
- .map(|(payload, details)| {
- pallet_bridge_messages::Pallet::::inbound_message_data(
- lane, payload, details,
- )
- })
- .collect()
-}
diff --git a/bin/runtime-common/src/messages_benchmarking.rs b/bin/runtime-common/src/messages_benchmarking.rs
deleted file mode 100644
index 0c7a9ad1a83..00000000000
--- a/bin/runtime-common/src/messages_benchmarking.rs
+++ /dev/null
@@ -1,314 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Parity Bridges Common.
-
-// Parity Bridges Common is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Bridges Common is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Bridges Common. If not, see .
-
-//! Everything required to run benchmarks of messages module, based on
-//! `bridge_runtime_common::messages` implementation.
-
-#![cfg(feature = "runtime-benchmarks")]
-
-use crate::{
- messages::{
- source::FromBridgedChainMessagesDeliveryProof, target::FromBridgedChainMessagesProof,
- AccountIdOf, BridgedChain, HashOf, MessageBridge, ThisChain,
- },
- messages_generation::{
- encode_all_messages, encode_lane_data, prepare_message_delivery_storage_proof,
- prepare_messages_storage_proof,
- },
-};
-
-use bp_messages::MessagePayload;
-use bp_polkadot_core::parachains::ParaHash;
-use bp_runtime::{Chain, Parachain, StorageProofSize, UnderlyingChainOf};
-use codec::Encode;
-use frame_support::weights::Weight;
-use pallet_bridge_messages::benchmarking::{MessageDeliveryProofParams, MessageProofParams};
-use sp_runtime::traits::{Header, Zero};
-use sp_std::prelude::*;
-use xcm::latest::prelude::*;
-
-/// Prepare inbound bridge message according to given message proof parameters.
-fn prepare_inbound_message(
- params: &MessageProofParams,
- successful_dispatch_message_generator: impl Fn(usize) -> MessagePayload,
-) -> MessagePayload {
- // we only care about **this** message size when message proof needs to be `Minimal`
- let expected_size = match params.size {
- StorageProofSize::Minimal(size) => size as usize,
- _ => 0,
- };
-
- // if we don't need a correct message, then we may just return some random blob
- if !params.is_successful_dispatch_expected {
- return vec![0u8; expected_size]
- }
-
- // else let's prepare successful message.
- let msg = successful_dispatch_message_generator(expected_size);
- assert!(
- msg.len() >= expected_size,
- "msg.len(): {} does not match expected_size: {}",
- expected_size,
- msg.len()
- );
- msg
-}
-
-/// Prepare proof of messages for the `receive_messages_proof` call.
-///
-/// In addition to returning valid messages proof, environment is prepared to verify this message
-/// proof.
-///
-/// This method is intended to be used when benchmarking pallet, linked to the chain that
-/// uses GRANDPA finality. For parachains, please use the `prepare_message_proof_from_parachain`
-/// function.
-pub fn prepare_message_proof_from_grandpa_chain(
- params: MessageProofParams,
- message_generator: impl Fn(usize) -> MessagePayload,
-) -> (FromBridgedChainMessagesProof>>, Weight)
-where
- R: pallet_bridge_grandpa::Config>>,
- FI: 'static,
- B: MessageBridge,
-{
- // prepare storage proof
- let (state_root, storage_proof) = prepare_messages_storage_proof::(
- params.lane,
- params.message_nonces.clone(),
- params.outbound_lane_data.clone(),
- params.size,
- prepare_inbound_message(¶ms, message_generator),
- encode_all_messages,
- encode_lane_data,
- );
-
- // update runtime storage
- let (_, bridged_header_hash) = insert_header_to_grandpa_pallet::(state_root);
-
- (
- FromBridgedChainMessagesProof {
- bridged_header_hash,
- storage_proof,
- lane: params.lane,
- nonces_start: *params.message_nonces.start(),
- nonces_end: *params.message_nonces.end(),
- },
- Weight::MAX / 1000,
- )
-}
-
-/// Prepare proof of messages for the `receive_messages_proof` call.
-///
-/// In addition to returning valid messages proof, environment is prepared to verify this message
-/// proof.
-///
-/// This method is intended to be used when benchmarking pallet, linked to the chain that
-/// uses parachain finality. For GRANDPA chains, please use the
-/// `prepare_message_proof_from_grandpa_chain` function.
-pub fn prepare_message_proof_from_parachain(
- params: MessageProofParams,
- message_generator: impl Fn(usize) -> MessagePayload,
-) -> (FromBridgedChainMessagesProof>>, Weight)
-where
- R: pallet_bridge_parachains::Config,
- PI: 'static,
- B: MessageBridge,
- UnderlyingChainOf>: Chain + Parachain,
-{
- // prepare storage proof
- let (state_root, storage_proof) = prepare_messages_storage_proof::(
- params.lane,
- params.message_nonces.clone(),
- params.outbound_lane_data.clone(),
- params.size,
- prepare_inbound_message(¶ms, message_generator),
- encode_all_messages,
- encode_lane_data,
- );
-
- // update runtime storage
- let (_, bridged_header_hash) =
- insert_header_to_parachains_pallet::>>(state_root);
-
- (
- FromBridgedChainMessagesProof {
- bridged_header_hash,
- storage_proof,
- lane: params.lane,
- nonces_start: *params.message_nonces.start(),
- nonces_end: *params.message_nonces.end(),
- },
- Weight::MAX / 1000,
- )
-}
-
-/// Prepare proof of messages delivery for the `receive_messages_delivery_proof` call.
-///
-/// This method is intended to be used when benchmarking pallet, linked to the chain that
-/// uses GRANDPA finality. For parachains, please use the
-/// `prepare_message_delivery_proof_from_parachain` function.
-pub fn prepare_message_delivery_proof_from_grandpa_chain(
- params: MessageDeliveryProofParams>>,
-) -> FromBridgedChainMessagesDeliveryProof>>
-where
- R: pallet_bridge_grandpa::Config>>,
- FI: 'static,
- B: MessageBridge,
-{
- // prepare storage proof
- let lane = params.lane;
- let (state_root, storage_proof) = prepare_message_delivery_storage_proof::(
- params.lane,
- params.inbound_lane_data,
- params.size,
- );
-
- // update runtime storage
- let (_, bridged_header_hash) = insert_header_to_grandpa_pallet::(state_root);
-
- FromBridgedChainMessagesDeliveryProof {
- bridged_header_hash: bridged_header_hash.into(),
- storage_proof,
- lane,
- }
-}
-
-/// Prepare proof of messages delivery for the `receive_messages_delivery_proof` call.
-///
-/// This method is intended to be used when benchmarking pallet, linked to the chain that
-/// uses parachain finality. For GRANDPA chains, please use the
-/// `prepare_message_delivery_proof_from_grandpa_chain` function.
-pub fn prepare_message_delivery_proof_from_parachain(
- params: MessageDeliveryProofParams>>,
-) -> FromBridgedChainMessagesDeliveryProof>>
-where
- R: pallet_bridge_parachains::Config,
- PI: 'static,
- B: MessageBridge,
- UnderlyingChainOf>: Chain + Parachain,
-{
- // prepare storage proof
- let lane = params.lane;
- let (state_root, storage_proof) = prepare_message_delivery_storage_proof::(
- params.lane,
- params.inbound_lane_data,
- params.size,
- );
-
- // update runtime storage
- let (_, bridged_header_hash) =
- insert_header_to_parachains_pallet::>>(state_root);
-
- FromBridgedChainMessagesDeliveryProof {
- bridged_header_hash: bridged_header_hash.into(),
- storage_proof,
- lane,
- }
-}
-
-/// Insert header to the bridge GRANDPA pallet.
-pub(crate) fn insert_header_to_grandpa_pallet(
- state_root: bp_runtime::HashOf,
-) -> (bp_runtime::BlockNumberOf, bp_runtime::HashOf)
-where
- R: pallet_bridge_grandpa::Config,
- GI: 'static,
- R::BridgedChain: bp_runtime::Chain,
-{
- let bridged_block_number = Zero::zero();
- let bridged_header = bp_runtime::HeaderOf::::new(
- bridged_block_number,
- Default::default(),
- state_root,
- Default::default(),
- Default::default(),
- );
- let bridged_header_hash = bridged_header.hash();
- pallet_bridge_grandpa::initialize_for_benchmarks::(bridged_header);
- (bridged_block_number, bridged_header_hash)
-}
-
-/// Insert header to the bridge parachains pallet.
-pub(crate) fn insert_header_to_parachains_pallet(
- state_root: bp_runtime::HashOf,
-) -> (bp_runtime::BlockNumberOf, bp_runtime::HashOf)
-where
- R: pallet_bridge_parachains::Config,
- PI: 'static,
- PC: Chain + Parachain,
-{
- let bridged_block_number = Zero::zero();
- let bridged_header = bp_runtime::HeaderOf::::new(
- bridged_block_number,
- Default::default(),
- state_root,
- Default::default(),
- Default::default(),
- );
- let bridged_header_hash = bridged_header.hash();
- pallet_bridge_parachains::initialize_for_benchmarks::(bridged_header);
- (bridged_block_number, bridged_header_hash)
-}
-
-/// Returns callback which generates `BridgeMessage` from Polkadot XCM builder based on
-/// `expected_message_size` for benchmark.
-pub fn generate_xcm_builder_bridge_message_sample(
- destination: InteriorLocation,
-) -> impl Fn(usize) -> MessagePayload {
- move |expected_message_size| -> MessagePayload {
- // For XCM bridge hubs, it is the message that
- // will be pushed further to some XCM queue (XCMP/UMP)
- let location = xcm::VersionedInteriorLocation::V4(destination.clone());
- let location_encoded_size = location.encoded_size();
-
- // we don't need to be super-precise with `expected_size` here
- let xcm_size = expected_message_size.saturating_sub(location_encoded_size);
- let xcm_data_size = xcm_size.saturating_sub(
- // minus empty instruction size
- Instruction::<()>::ExpectPallet {
- index: 0,
- name: vec![],
- module_name: vec![],
- crate_major: 0,
- min_crate_minor: 0,
- }
- .encoded_size(),
- );
-
- log::trace!(
- target: "runtime::bridge-benchmarks",
- "generate_xcm_builder_bridge_message_sample with expected_message_size: {}, location_encoded_size: {}, xcm_size: {}, xcm_data_size: {}",
- expected_message_size, location_encoded_size, xcm_size, xcm_data_size,
- );
-
- let xcm = xcm::VersionedXcm::<()>::V4(
- vec![Instruction::<()>::ExpectPallet {
- index: 0,
- name: vec![42; xcm_data_size],
- module_name: vec![],
- crate_major: 0,
- min_crate_minor: 0,
- }]
- .into(),
- );
-
- // this is the `BridgeMessage` from polkadot xcm builder, but it has no constructor
- // or public fields, so just tuple
- // (double encoding, because `.encode()` is called on original Xcm BLOB when it is pushed
- // to the storage)
- (location, xcm).encode().encode()
- }
-}
diff --git a/bin/runtime-common/src/messages_call_ext.rs b/bin/runtime-common/src/messages_call_ext.rs
deleted file mode 100644
index fb07f7b6dd6..00000000000
--- a/bin/runtime-common/src/messages_call_ext.rs
+++ /dev/null
@@ -1,692 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Parity Bridges Common.
-
-// Parity Bridges Common is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Bridges Common is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Bridges Common. If not, see .
-
-//! Signed extension for the `pallet-bridge-messages` that is able to reject obsolete
-//! (and some other invalid) transactions.
-
-use crate::messages::{
- source::FromBridgedChainMessagesDeliveryProof, target::FromBridgedChainMessagesProof,
-};
-use bp_messages::{target_chain::MessageDispatch, InboundLaneData, LaneId, MessageNonce};
-use bp_runtime::OwnedBridgeModule;
-use frame_support::{
- dispatch::CallableCallFor,
- traits::{Get, IsSubType},
-};
-use pallet_bridge_messages::{Config, Pallet};
-use sp_runtime::{transaction_validity::TransactionValidity, RuntimeDebug};
-use sp_std::ops::RangeInclusive;
-
-/// Generic info about a messages delivery/confirmation proof.
-#[derive(PartialEq, RuntimeDebug)]
-pub struct BaseMessagesProofInfo {
- /// Message lane, used by the call.
- pub lane_id: LaneId,
- /// Nonces of messages, included in the call.
- ///
- /// For delivery transaction, it is nonces of bundled messages. For confirmation
- /// transaction, it is nonces that are to be confirmed during the call.
- pub bundled_range: RangeInclusive,
- /// Nonce of the best message, stored by this chain before the call is dispatched.
- ///
- /// For delivery transaction, it is the nonce of best delivered message before the call.
- /// For confirmation transaction, it is the nonce of best confirmed message before the call.
- pub best_stored_nonce: MessageNonce,
-}
-
-impl BaseMessagesProofInfo {
- /// Returns true if `bundled_range` continues the `0..=best_stored_nonce` range.
- fn appends_to_stored_nonce(&self) -> bool {
- Some(*self.bundled_range.start()) == self.best_stored_nonce.checked_add(1)
- }
-}
-
-/// Occupation state of the unrewarded relayers vector.
-#[derive(PartialEq, RuntimeDebug)]
-#[cfg_attr(test, derive(Default))]
-pub struct UnrewardedRelayerOccupation {
- /// The number of remaining unoccupied entries for new relayers.
- pub free_relayer_slots: MessageNonce,
- /// The number of messages that we are ready to accept.
- pub free_message_slots: MessageNonce,
-}
-
-/// Info about a `ReceiveMessagesProof` call which tries to update a single lane.
-#[derive(PartialEq, RuntimeDebug)]
-pub struct ReceiveMessagesProofInfo {
- /// Base messages proof info
- pub base: BaseMessagesProofInfo,
- /// State of unrewarded relayers vector.
- pub unrewarded_relayers: UnrewardedRelayerOccupation,
-}
-
-impl ReceiveMessagesProofInfo {
- /// Returns true if:
- ///
- /// - either inbound lane is ready to accept bundled messages;
- ///
- /// - or there are no bundled messages, but the inbound lane is blocked by too many unconfirmed
- /// messages and/or unrewarded relayers.
- fn is_obsolete(&self, is_dispatcher_active: bool) -> bool {
- // if dispatcher is inactive, we don't accept any delivery transactions
- if !is_dispatcher_active {
- return true
- }
-
- // transactions with zero bundled nonces are not allowed, unless they're message
- // delivery transactions, which brings reward confirmations required to unblock
- // the lane
- if self.base.bundled_range.is_empty() {
- let empty_transactions_allowed =
- // we allow empty transactions when we can't accept delivery from new relayers
- self.unrewarded_relayers.free_relayer_slots == 0 ||
- // or if we can't accept new messages at all
- self.unrewarded_relayers.free_message_slots == 0;
-
- return !empty_transactions_allowed
- }
-
- // otherwise we require bundled messages to continue stored range
- !self.base.appends_to_stored_nonce()
- }
-}
-
-/// Info about a `ReceiveMessagesDeliveryProof` call which tries to update a single lane.
-#[derive(PartialEq, RuntimeDebug)]
-pub struct ReceiveMessagesDeliveryProofInfo(pub BaseMessagesProofInfo);
-
-impl ReceiveMessagesDeliveryProofInfo {
- /// Returns true if outbound lane is ready to accept confirmations of bundled messages.
- fn is_obsolete(&self) -> bool {
- self.0.bundled_range.is_empty() || !self.0.appends_to_stored_nonce()
- }
-}
-
-/// Info about a `ReceiveMessagesProof` or a `ReceiveMessagesDeliveryProof` call
-/// which tries to update a single lane.
-#[derive(PartialEq, RuntimeDebug)]
-pub enum CallInfo {
- /// Messages delivery call info.
- ReceiveMessagesProof(ReceiveMessagesProofInfo),
- /// Messages delivery confirmation call info.
- ReceiveMessagesDeliveryProof(ReceiveMessagesDeliveryProofInfo),
-}
-
-impl CallInfo {
- /// Returns range of messages, bundled with the call.
- pub fn bundled_messages(&self) -> RangeInclusive {
- match *self {
- Self::ReceiveMessagesProof(ref info) => info.base.bundled_range.clone(),
- Self::ReceiveMessagesDeliveryProof(ref info) => info.0.bundled_range.clone(),
- }
- }
-}
-
-/// Helper struct that provides methods for working with a call supported by `CallInfo`.
-pub struct CallHelper, I: 'static> {
- _phantom_data: sp_std::marker::PhantomData<(T, I)>,
-}
-
-impl, I: 'static> CallHelper {
- /// Returns true if:
- ///
- /// - call is `receive_messages_proof` and all messages have been delivered;
- ///
- /// - call is `receive_messages_delivery_proof` and all messages confirmations have been
- /// received.
- pub fn was_successful(info: &CallInfo) -> bool {
- match info {
- CallInfo::ReceiveMessagesProof(info) => {
- let inbound_lane_data =
- pallet_bridge_messages::InboundLanes::::get(info.base.lane_id);
- if info.base.bundled_range.is_empty() {
- let post_occupation =
- unrewarded_relayers_occupation::(&inbound_lane_data);
- // we don't care about `free_relayer_slots` here - it is checked in
- // `is_obsolete` and every relayer has delivered at least one message,
- // so if relayer slots are released, then message slots are also
- // released
- return post_occupation.free_message_slots >
- info.unrewarded_relayers.free_message_slots
- }
-
- inbound_lane_data.last_delivered_nonce() == *info.base.bundled_range.end()
- },
- CallInfo::ReceiveMessagesDeliveryProof(info) => {
- let outbound_lane_data =
- pallet_bridge_messages::OutboundLanes::::get(info.0.lane_id);
- outbound_lane_data.latest_received_nonce == *info.0.bundled_range.end()
- },
- }
- }
-}
-
-/// Trait representing a call that is a sub type of `pallet_bridge_messages::Call`.
-pub trait MessagesCallSubType, I: 'static>:
- IsSubType, T>>
-{
- /// Create a new instance of `ReceiveMessagesProofInfo` from a `ReceiveMessagesProof` call.
- fn receive_messages_proof_info(&self) -> Option;
-
- /// Create a new instance of `ReceiveMessagesDeliveryProofInfo` from
- /// a `ReceiveMessagesDeliveryProof` call.
- fn receive_messages_delivery_proof_info(&self) -> Option;
-
- /// Create a new instance of `CallInfo` from a `ReceiveMessagesProof`
- /// or a `ReceiveMessagesDeliveryProof` call.
- fn call_info(&self) -> Option;
-
- /// Create a new instance of `CallInfo` from a `ReceiveMessagesProof`
- /// or a `ReceiveMessagesDeliveryProof` call, if the call is for the provided lane.
- fn call_info_for(&self, lane_id: LaneId) -> Option;
-
- /// Ensures that a `ReceiveMessagesProof` or a `ReceiveMessagesDeliveryProof` call:
- ///
- /// - does not deliver already delivered messages. We require all messages in the
- /// `ReceiveMessagesProof` call to be undelivered;
- ///
- /// - does not submit empty `ReceiveMessagesProof` call with zero messages, unless the lane
- /// needs to be unblocked by providing relayer rewards proof;
- ///
- /// - brings no new delivery confirmations in a `ReceiveMessagesDeliveryProof` call. We require
- /// at least one new delivery confirmation in the unrewarded relayers set;
- ///
- /// - does not violate some basic (easy verifiable) messages pallet rules obsolete (like
- /// submitting a call when a pallet is halted or delivering messages when a dispatcher is
- /// inactive).
- ///
- /// If one of above rules is violated, the transaction is treated as invalid.
- fn check_obsolete_call(&self) -> TransactionValidity;
-}
-
-impl<
- BridgedHeaderHash,
- SourceHeaderChain: bp_messages::target_chain::SourceHeaderChain<
- MessagesProof = FromBridgedChainMessagesProof,
- >,
- TargetHeaderChain: bp_messages::source_chain::TargetHeaderChain<
- >::OutboundPayload,
- ::AccountId,
- MessagesDeliveryProof = FromBridgedChainMessagesDeliveryProof,
- >,
- Call: IsSubType, T>>,
- T: frame_system::Config
- + Config,
- I: 'static,
- > MessagesCallSubType for T::RuntimeCall
-{
- fn receive_messages_proof_info(&self) -> Option {
- if let Some(pallet_bridge_messages::Call::::receive_messages_proof {
- ref proof,
- ..
- }) = self.is_sub_type()
- {
- let inbound_lane_data = pallet_bridge_messages::InboundLanes::::get(proof.lane);
-
- return Some(ReceiveMessagesProofInfo {
- base: BaseMessagesProofInfo {
- lane_id: proof.lane,
- // we want all messages in this range to be new for us. Otherwise transaction
- // will be considered obsolete.
- bundled_range: proof.nonces_start..=proof.nonces_end,
- best_stored_nonce: inbound_lane_data.last_delivered_nonce(),
- },
- unrewarded_relayers: unrewarded_relayers_occupation::(&inbound_lane_data),
- })
- }
-
- None
- }
-
- fn receive_messages_delivery_proof_info(&self) -> Option {
- if let Some(pallet_bridge_messages::Call::::receive_messages_delivery_proof {
- ref proof,
- ref relayers_state,
- ..
- }) = self.is_sub_type()
- {
- let outbound_lane_data = pallet_bridge_messages::OutboundLanes::::get(proof.lane);
-
- return Some(ReceiveMessagesDeliveryProofInfo(BaseMessagesProofInfo {
- lane_id: proof.lane,
- // there's a time frame between message delivery, message confirmation and reward
- // confirmation. Because of that, we can't assume that our state has been confirmed
- // to the bridged chain. So we are accepting any proof that brings new
- // confirmations.
- bundled_range: outbound_lane_data.latest_received_nonce + 1..=
- relayers_state.last_delivered_nonce,
- best_stored_nonce: outbound_lane_data.latest_received_nonce,
- }))
- }
-
- None
- }
-
- fn call_info(&self) -> Option {
- if let Some(info) = self.receive_messages_proof_info() {
- return Some(CallInfo::ReceiveMessagesProof(info))
- }
-
- if let Some(info) = self.receive_messages_delivery_proof_info() {
- return Some(CallInfo::ReceiveMessagesDeliveryProof(info))
- }
-
- None
- }
-
- fn call_info_for(&self, lane_id: LaneId) -> Option {
- self.call_info().filter(|info| {
- let actual_lane_id = match info {
- CallInfo::ReceiveMessagesProof(info) => info.base.lane_id,
- CallInfo::ReceiveMessagesDeliveryProof(info) => info.0.lane_id,
- };
- actual_lane_id == lane_id
- })
- }
-
- fn check_obsolete_call(&self) -> TransactionValidity {
- let is_pallet_halted = Pallet::::ensure_not_halted().is_err();
- match self.call_info() {
- Some(proof_info) if is_pallet_halted => {
- log::trace!(
- target: pallet_bridge_messages::LOG_TARGET,
- "Rejecting messages transaction on halted pallet: {:?}",
- proof_info
- );
-
- return sp_runtime::transaction_validity::InvalidTransaction::Call.into()
- },
- Some(CallInfo::ReceiveMessagesProof(proof_info))
- if proof_info.is_obsolete(T::MessageDispatch::is_active()) =>
- {
- log::trace!(
- target: pallet_bridge_messages::LOG_TARGET,
- "Rejecting obsolete messages delivery transaction: {:?}",
- proof_info
- );
-
- return sp_runtime::transaction_validity::InvalidTransaction::Stale.into()
- },
- Some(CallInfo::ReceiveMessagesDeliveryProof(proof_info))
- if proof_info.is_obsolete() =>
- {
- log::trace!(
- target: pallet_bridge_messages::LOG_TARGET,
- "Rejecting obsolete messages confirmation transaction: {:?}",
- proof_info,
- );
-
- return sp_runtime::transaction_validity::InvalidTransaction::Stale.into()
- },
- _ => {},
- }
-
- Ok(sp_runtime::transaction_validity::ValidTransaction::default())
- }
-}
-
-/// Returns occupation state of unrewarded relayers vector.
-fn unrewarded_relayers_occupation, I: 'static>(
- inbound_lane_data: &InboundLaneData,
-) -> UnrewardedRelayerOccupation {
- UnrewardedRelayerOccupation {
- free_relayer_slots: T::MaxUnrewardedRelayerEntriesAtInboundLane::get()
- .saturating_sub(inbound_lane_data.relayers.len() as MessageNonce),
- free_message_slots: {
- let unconfirmed_messages = inbound_lane_data
- .last_delivered_nonce()
- .saturating_sub(inbound_lane_data.last_confirmed_nonce);
- T::MaxUnconfirmedMessagesAtInboundLane::get().saturating_sub(unconfirmed_messages)
- },
- }
-}
-
-#[cfg(test)]
-mod tests {
- use super::*;
- use crate::{
- messages::{
- source::FromBridgedChainMessagesDeliveryProof, target::FromBridgedChainMessagesProof,
- },
- messages_call_ext::MessagesCallSubType,
- mock::{
- DummyMessageDispatch, MaxUnconfirmedMessagesAtInboundLane,
- MaxUnrewardedRelayerEntriesAtInboundLane, TestRuntime, ThisChainRuntimeCall,
- },
- };
- use bp_messages::{DeliveredMessages, UnrewardedRelayer, UnrewardedRelayersState};
- use sp_std::ops::RangeInclusive;
-
- fn fill_unrewarded_relayers() {
- let mut inbound_lane_state =
- pallet_bridge_messages::InboundLanes::::get(LaneId([0, 0, 0, 0]));
- for n in 0..MaxUnrewardedRelayerEntriesAtInboundLane::get() {
- inbound_lane_state.relayers.push_back(UnrewardedRelayer {
- relayer: Default::default(),
- messages: DeliveredMessages { begin: n + 1, end: n + 1 },
- });
- }
- pallet_bridge_messages::InboundLanes::::insert(
- LaneId([0, 0, 0, 0]),
- inbound_lane_state,
- );
- }
-
- fn fill_unrewarded_messages() {
- let mut inbound_lane_state =
- pallet_bridge_messages::InboundLanes::::get(LaneId([0, 0, 0, 0]));
- inbound_lane_state.relayers.push_back(UnrewardedRelayer {
- relayer: Default::default(),
- messages: DeliveredMessages {
- begin: 1,
- end: MaxUnconfirmedMessagesAtInboundLane::get(),
- },
- });
- pallet_bridge_messages::InboundLanes::::insert(
- LaneId([0, 0, 0, 0]),
- inbound_lane_state,
- );
- }
-
- fn deliver_message_10() {
- pallet_bridge_messages::InboundLanes::::insert(
- LaneId([0, 0, 0, 0]),
- bp_messages::InboundLaneData { relayers: Default::default(), last_confirmed_nonce: 10 },
- );
- }
-
- fn validate_message_delivery(
- nonces_start: bp_messages::MessageNonce,
- nonces_end: bp_messages::MessageNonce,
- ) -> bool {
- ThisChainRuntimeCall::BridgeMessages(
- pallet_bridge_messages::Call::::receive_messages_proof {
- relayer_id_at_bridged_chain: 42,
- messages_count: nonces_end.checked_sub(nonces_start).map(|x| x + 1).unwrap_or(0)
- as u32,
- dispatch_weight: frame_support::weights::Weight::zero(),
- proof: FromBridgedChainMessagesProof {
- bridged_header_hash: Default::default(),
- storage_proof: vec![],
- lane: LaneId([0, 0, 0, 0]),
- nonces_start,
- nonces_end,
- },
- },
- )
- .check_obsolete_call()
- .is_ok()
- }
-
- #[test]
- fn extension_rejects_obsolete_messages() {
- sp_io::TestExternalities::new(Default::default()).execute_with(|| {
- // when current best delivered is message#10 and we're trying to deliver messages 8..=9
- // => tx is rejected
- deliver_message_10();
- assert!(!validate_message_delivery(8, 9));
- });
- }
-
- #[test]
- fn extension_rejects_same_message() {
- sp_io::TestExternalities::new(Default::default()).execute_with(|| {
- // when current best delivered is message#10 and we're trying to import messages 10..=10
- // => tx is rejected
- deliver_message_10();
- assert!(!validate_message_delivery(8, 10));
- });
- }
-
- #[test]
- fn extension_rejects_call_with_some_obsolete_messages() {
- sp_io::TestExternalities::new(Default::default()).execute_with(|| {
- // when current best delivered is message#10 and we're trying to deliver messages
- // 10..=15 => tx is rejected
- deliver_message_10();
- assert!(!validate_message_delivery(10, 15));
- });
- }
-
- #[test]
- fn extension_rejects_call_with_future_messages() {
- sp_io::TestExternalities::new(Default::default()).execute_with(|| {
- // when current best delivered is message#10 and we're trying to deliver messages
- // 13..=15 => tx is rejected
- deliver_message_10();
- assert!(!validate_message_delivery(13, 15));
- });
- }
-
- #[test]
- fn extension_reject_call_when_dispatcher_is_inactive() {
- sp_io::TestExternalities::new(Default::default()).execute_with(|| {
- // when current best delivered is message#10 and we're trying to deliver message 11..=15
- // => tx is accepted, but we have inactive dispatcher, so...
- deliver_message_10();
-
- DummyMessageDispatch::deactivate();
- assert!(!validate_message_delivery(11, 15));
- });
- }
-
- #[test]
- fn extension_rejects_empty_delivery_with_rewards_confirmations_if_there_are_free_relayer_and_message_slots(
- ) {
- sp_io::TestExternalities::new(Default::default()).execute_with(|| {
- deliver_message_10();
- assert!(!validate_message_delivery(10, 9));
- });
- }
-
- #[test]
- fn extension_accepts_empty_delivery_with_rewards_confirmations_if_there_are_no_free_relayer_slots(
- ) {
- sp_io::TestExternalities::new(Default::default()).execute_with(|| {
- deliver_message_10();
- fill_unrewarded_relayers();
- assert!(validate_message_delivery(10, 9));
- });
- }
-
- #[test]
- fn extension_accepts_empty_delivery_with_rewards_confirmations_if_there_are_no_free_message_slots(
- ) {
- sp_io::TestExternalities::new(Default::default()).execute_with(|| {
- fill_unrewarded_messages();
- assert!(validate_message_delivery(
- MaxUnconfirmedMessagesAtInboundLane::get(),
- MaxUnconfirmedMessagesAtInboundLane::get() - 1
- ));
- });
- }
-
- #[test]
- fn extension_accepts_new_messages() {
- sp_io::TestExternalities::new(Default::default()).execute_with(|| {
- // when current best delivered is message#10 and we're trying to deliver message 11..=15
- // => tx is accepted
- deliver_message_10();
- assert!(validate_message_delivery(11, 15));
- });
- }
-
- fn confirm_message_10() {
- pallet_bridge_messages::OutboundLanes::::insert(
- LaneId([0, 0, 0, 0]),
- bp_messages::OutboundLaneData {
- oldest_unpruned_nonce: 0,
- latest_received_nonce: 10,
- latest_generated_nonce: 10,
- },
- );
- }
-
- fn validate_message_confirmation(last_delivered_nonce: bp_messages::MessageNonce) -> bool {
- ThisChainRuntimeCall::BridgeMessages(
- pallet_bridge_messages::Call::::receive_messages_delivery_proof {
- proof: FromBridgedChainMessagesDeliveryProof {
- bridged_header_hash: Default::default(),
- storage_proof: Vec::new(),
- lane: LaneId([0, 0, 0, 0]),
- },
- relayers_state: UnrewardedRelayersState {
- last_delivered_nonce,
- ..Default::default()
- },
- },
- )
- .check_obsolete_call()
- .is_ok()
- }
-
- #[test]
- fn extension_rejects_obsolete_confirmations() {
- sp_io::TestExternalities::new(Default::default()).execute_with(|| {
- // when current best confirmed is message#10 and we're trying to confirm message#5 => tx
- // is rejected
- confirm_message_10();
- assert!(!validate_message_confirmation(5));
- });
- }
-
- #[test]
- fn extension_rejects_same_confirmation() {
- sp_io::TestExternalities::new(Default::default()).execute_with(|| {
- // when current best confirmed is message#10 and we're trying to confirm message#10 =>
- // tx is rejected
- confirm_message_10();
- assert!(!validate_message_confirmation(10));
- });
- }
-
- #[test]
- fn extension_rejects_empty_confirmation_even_if_there_are_no_free_unrewarded_entries() {
- sp_io::TestExternalities::new(Default::default()).execute_with(|| {
- confirm_message_10();
- fill_unrewarded_relayers();
- assert!(!validate_message_confirmation(10));
- });
- }
-
- #[test]
- fn extension_accepts_new_confirmation() {
- sp_io::TestExternalities::new(Default::default()).execute_with(|| {
- // when current best confirmed is message#10 and we're trying to confirm message#15 =>
- // tx is accepted
- confirm_message_10();
- assert!(validate_message_confirmation(15));
- });
- }
-
- fn was_message_delivery_successful(
- bundled_range: RangeInclusive,
- is_empty: bool,
- ) -> bool {
- CallHelper::::was_successful(&CallInfo::ReceiveMessagesProof(
- ReceiveMessagesProofInfo {
- base: BaseMessagesProofInfo {
- lane_id: LaneId([0, 0, 0, 0]),
- bundled_range,
- best_stored_nonce: 0, // doesn't matter for `was_successful`
- },
- unrewarded_relayers: UnrewardedRelayerOccupation {
- free_relayer_slots: 0, // doesn't matter for `was_successful`
- free_message_slots: if is_empty {
- 0
- } else {
- MaxUnconfirmedMessagesAtInboundLane::get()
- },
- },
- },
- ))
- }
-
- #[test]
- #[allow(clippy::reversed_empty_ranges)]
- fn was_successful_returns_false_for_failed_reward_confirmation_transaction() {
- sp_io::TestExternalities::new(Default::default()).execute_with(|| {
- fill_unrewarded_messages();
- assert!(!was_message_delivery_successful(10..=9, true));
- });
- }
-
- #[test]
- #[allow(clippy::reversed_empty_ranges)]
- fn was_successful_returns_true_for_successful_reward_confirmation_transaction() {
- sp_io::TestExternalities::new(Default::default()).execute_with(|| {
- assert!(was_message_delivery_successful(10..=9, true));
- });
- }
-
- #[test]
- fn was_successful_returns_false_for_failed_delivery() {
- sp_io::TestExternalities::new(Default::default()).execute_with(|| {
- deliver_message_10();
- assert!(!was_message_delivery_successful(10..=12, false));
- });
- }
-
- #[test]
- fn was_successful_returns_false_for_partially_successful_delivery() {
- sp_io::TestExternalities::new(Default::default()).execute_with(|| {
- deliver_message_10();
- assert!(!was_message_delivery_successful(9..=12, false));
- });
- }
-
- #[test]
- fn was_successful_returns_true_for_successful_delivery() {
- sp_io::TestExternalities::new(Default::default()).execute_with(|| {
- deliver_message_10();
- assert!(was_message_delivery_successful(9..=10, false));
- });
- }
-
- fn was_message_confirmation_successful(bundled_range: RangeInclusive) -> bool {
- CallHelper::::was_successful(&CallInfo::ReceiveMessagesDeliveryProof(
- ReceiveMessagesDeliveryProofInfo(BaseMessagesProofInfo {
- lane_id: LaneId([0, 0, 0, 0]),
- bundled_range,
- best_stored_nonce: 0, // doesn't matter for `was_successful`
- }),
- ))
- }
-
- #[test]
- fn was_successful_returns_false_for_failed_confirmation() {
- sp_io::TestExternalities::new(Default::default()).execute_with(|| {
- confirm_message_10();
- assert!(!was_message_confirmation_successful(10..=12));
- });
- }
-
- #[test]
- fn was_successful_returns_false_for_partially_successful_confirmation() {
- sp_io::TestExternalities::new(Default::default()).execute_with(|| {
- confirm_message_10();
- assert!(!was_message_confirmation_successful(9..=12));
- });
- }
-
- #[test]
- fn was_successful_returns_true_for_successful_confirmation() {
- sp_io::TestExternalities::new(Default::default()).execute_with(|| {
- confirm_message_10();
- assert!(was_message_confirmation_successful(9..=10));
- });
- }
-}
diff --git a/bin/runtime-common/src/messages_generation.rs b/bin/runtime-common/src/messages_generation.rs
deleted file mode 100644
index c37aaa5d4d5..00000000000
--- a/bin/runtime-common/src/messages_generation.rs
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Parity Bridges Common.
-
-// Parity Bridges Common is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Bridges Common is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Bridges Common. If not, see .
-
-//! Helpers for generating message storage proofs, that are used by tests and by benchmarks.
-
-use crate::messages::{AccountIdOf, BridgedChain, HashOf, HasherOf, MessageBridge, ThisChain};
-
-use bp_messages::{
- storage_keys, InboundLaneData, LaneId, MessageKey, MessageNonce, MessagePayload,
- OutboundLaneData,
-};
-use bp_runtime::{record_all_trie_keys, RawStorageProof, StorageProofSize};
-use codec::Encode;
-use sp_std::{ops::RangeInclusive, prelude::*};
-use sp_trie::{trie_types::TrieDBMutBuilderV1, LayoutV1, MemoryDB, TrieMut};
-
-/// Simple and correct message data encode function.
-pub fn encode_all_messages(_: MessageNonce, m: &MessagePayload) -> Option> {
- Some(m.encode())
-}
-
-/// Simple and correct outbound lane data encode function.
-pub fn encode_lane_data(d: &OutboundLaneData) -> Vec {
- d.encode()
-}
-
-/// Prepare storage proof of given messages.
-///
-/// Returns state trie root and nodes with prepared messages.
-pub fn prepare_messages_storage_proof(
- lane: LaneId,
- message_nonces: RangeInclusive,
- outbound_lane_data: Option,
- size: StorageProofSize,
- message_payload: MessagePayload,
- encode_message: impl Fn(MessageNonce, &MessagePayload) -> Option>,
- encode_outbound_lane_data: impl Fn(&OutboundLaneData) -> Vec,
-) -> (HashOf>, RawStorageProof)
-where
- B: MessageBridge,
- HashOf>: Copy + Default,
-{
- // prepare Bridged chain storage with messages and (optionally) outbound lane state
- let message_count = message_nonces.end().saturating_sub(*message_nonces.start()) + 1;
- let mut storage_keys = Vec::with_capacity(message_count as usize + 1);
- let mut root = Default::default();
- let mut mdb = MemoryDB::default();
- {
- let mut trie =
- TrieDBMutBuilderV1::>>::new(&mut mdb, &mut root).build();
-
- // insert messages
- for (i, nonce) in message_nonces.into_iter().enumerate() {
- let message_key = MessageKey { lane_id: lane, nonce };
- let message_payload = match encode_message(nonce, &message_payload) {
- Some(message_payload) =>
- if i == 0 {
- grow_trie_leaf_value(message_payload, size)
- } else {
- message_payload
- },
- None => continue,
- };
- let storage_key = storage_keys::message_key(
- B::BRIDGED_MESSAGES_PALLET_NAME,
- &message_key.lane_id,
- message_key.nonce,
- )
- .0;
- trie.insert(&storage_key, &message_payload)
- .map_err(|_| "TrieMut::insert has failed")
- .expect("TrieMut::insert should not fail in benchmarks");
- storage_keys.push(storage_key);
- }
-
- // insert outbound lane state
- if let Some(outbound_lane_data) = outbound_lane_data.as_ref().map(encode_outbound_lane_data)
- {
- let storage_key =
- storage_keys::outbound_lane_data_key(B::BRIDGED_MESSAGES_PALLET_NAME, &lane).0;
- trie.insert(&storage_key, &outbound_lane_data)
- .map_err(|_| "TrieMut::insert has failed")
- .expect("TrieMut::insert should not fail in benchmarks");
- storage_keys.push(storage_key);
- }
- }
-
- // generate storage proof to be delivered to This chain
- let storage_proof = record_all_trie_keys::>>, _>(&mdb, &root)
- .map_err(|_| "record_all_trie_keys has failed")
- .expect("record_all_trie_keys should not fail in benchmarks");
- (root, storage_proof)
-}
-
-/// Prepare storage proof of given messages delivery.
-///
-/// Returns state trie root and nodes with prepared messages.
-pub fn prepare_message_delivery_storage_proof(
- lane: LaneId,
- inbound_lane_data: InboundLaneData>>,
- size: StorageProofSize,
-) -> (HashOf>, RawStorageProof)
-where
- B: MessageBridge,
-{
- // prepare Bridged chain storage with inbound lane state
- let storage_key = storage_keys::inbound_lane_data_key(B::BRIDGED_MESSAGES_PALLET_NAME, &lane).0;
- let mut root = Default::default();
- let mut mdb = MemoryDB::default();
- {
- let mut trie =
- TrieDBMutBuilderV1::>>::new(&mut mdb, &mut root).build();
- let inbound_lane_data = grow_trie_leaf_value(inbound_lane_data.encode(), size);
- trie.insert(&storage_key, &inbound_lane_data)
- .map_err(|_| "TrieMut::insert has failed")
- .expect("TrieMut::insert should not fail in benchmarks");
- }
-
- // generate storage proof to be delivered to This chain
- let storage_proof = record_all_trie_keys::