diff --git a/.cargo/config.toml b/.cargo/config.toml
new file mode 100644
index 00000000000..66b28b3485d
--- /dev/null
+++ b/.cargo/config.toml
@@ -0,0 +1,32 @@
+#
+# An auto defined `clippy` feature was introduced,
+# but it was found to clash with user defined features,
+# so was renamed to `cargo-clippy`.
+#
+# If you want standard clippy run:
+# RUSTFLAGS= cargo clippy
+[target.'cfg(feature = "cargo-clippy")']
+rustflags = [
+ "-Aclippy::all",
+ "-Dclippy::correctness",
+ "-Aclippy::if-same-then-else",
+ "-Aclippy::clone-double-ref",
+ "-Dclippy::complexity",
+ "-Aclippy::zero-prefixed-literal", # 00_1000_000
+ "-Aclippy::type_complexity", # raison d'etre
+ "-Aclippy::nonminimal-bool", # maybe
+ "-Aclippy::borrowed-box", # Reasonable to fix this one
+ "-Aclippy::too-many-arguments", # (Turning this on would lead to)
+ "-Aclippy::unnecessary_cast", # Types may change
+ "-Aclippy::identity-op", # One case where we do 0 +
+ "-Aclippy::useless_conversion", # Types may change
+ "-Aclippy::unit_arg", # styalistic.
+ "-Aclippy::option-map-unit-fn", # styalistic
+ "-Aclippy::bind_instead_of_map", # styalistic
+ "-Aclippy::erasing_op", # E.g. 0 * DOLLARS
+ "-Aclippy::eq_op", # In tests we test equality.
+ "-Aclippy::while_immutable_condition", # false positives
+ "-Aclippy::needless_option_as_deref", # false positives
+ "-Aclippy::derivable_impls", # false positives
+ "-Aclippy::stable_sort_primitive", # prefer stable sort
+]
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index a5ad2bd555e..c67f5bb97ad 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -23,7 +23,7 @@ jobs:
run: rustup show
- name: Rust cache
- uses: Swatinem/rust-cache@6fd3edff6979b79f87531400ad694fb7f2c84b1f # v2.2.1
+ uses: Swatinem/rust-cache@988c164c3d0e93c4dbab36aaf5bbeb77425b2894 # v2.4.0
- name: Build rustdocs
run: SKIP_WASM_BUILD=1 cargo doc --all --no-deps
@@ -32,7 +32,7 @@ jobs:
run: echo "" > ./target/doc/index.html
- name: Deploy documentation
- uses: peaceiris/actions-gh-pages@de7ea6f8efb354206b205ef54722213d99067935 # v3.9.0
+ uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # v3.9.3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_branch: gh-pages
diff --git a/.github/workflows/release-30_create-draft.yml b/.github/workflows/release-30_create-draft.yml
index a3b39806eec..c4bb546dc78 100644
--- a/.github/workflows/release-30_create-draft.yml
+++ b/.github/workflows/release-30_create-draft.yml
@@ -126,7 +126,7 @@ jobs:
path: cumulus
ref: ${{ github.event.inputs.ref2 }}
- - uses: ruby/setup-ruby@d2b39ad0b52eca07d23f3aa14fdf2a3fcc1f411c # v1.148.0
+ - uses: ruby/setup-ruby@8a45918450651f5e4784b6031db26f4b9f76b251 # v1.150.0
with:
ruby-version: 3.0.0
@@ -253,7 +253,7 @@ jobs:
- name: Download artifacts
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
- - uses: ruby/setup-ruby@d2b39ad0b52eca07d23f3aa14fdf2a3fcc1f411c # v1.148.0
+ - uses: ruby/setup-ruby@8a45918450651f5e4784b6031db26f4b9f76b251 # v1.150.0
with:
ruby-version: 3.0.0
diff --git a/.gitignore b/.gitignore
index 58abcc32cc5..225be857745 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,4 @@ polkadot_argument_parsing
**/chains/
*.iml
.env
-bin
**/._*
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7166ace649f..7e7d2f252e2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ variables:
CI_IMAGE: "paritytech/ci-linux:production"
DOCKER_OS: "debian:stretch"
ARCH: "x86_64"
- ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.43"
+ ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.55"
BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29"
BUILDAH_COMMAND: "buildah --storage-driver overlay2"
diff --git a/BRIDGES.md b/BRIDGES.md
index a9fff624cdc..8766de92c17 100644
--- a/BRIDGES.md
+++ b/BRIDGES.md
@@ -18,13 +18,16 @@ it easier to import that change back to upstream repo.
# 2. How to pull latest Bridges code to the `bridges` subtree
(in practice)
+
+The `bridges` repo has a stabilized branch `polkadot-staging` dedicated for releasing.
+
```
cd
# this will update new git branches from bridges repo
# there could be unresolved conflicts, but dont worry,
# lots of them are caused because of removed unneeded files with patch step,
-./scripts/bridges_update_subtree.sh fetch
+BRANCH=polkadot-staging ./scripts/bridges_update_subtree.sh fetch
# so, after fetch and before solving conflicts just run patch,
# this will remove unneeded files and checks if subtree modules compiles
@@ -68,8 +71,8 @@ $ git remote add -f my-bridges git@github.com:tomusdrw/parity-bridges-common.git
2. To update Bridges:
```
-$ git fetch bridges master
-$ git subtree pull --prefix=bridges bridges master --squash
+$ git fetch bridges polkadot-staging
+$ git subtree pull --prefix=bridges bridges polkadot-staging --squash
````
We use `--squash` to avoid adding individual commits and rather squashing them
@@ -82,7 +85,7 @@ all into one.
4. Contributing back to Bridges (creating upstream PR)
```
-$ git subtree push --prefix=bridges my-bridges master
+$ git subtree push --prefix=bridges my-bridges polkadot-staging
```
This command will push changes to your personal fork of Bridges repo, from where
you can simply create a PR to the main repo.
diff --git a/Cargo.lock b/Cargo.lock
index b340d9d067f..1b3bfd30455 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -12,22 +12,13 @@ dependencies = [
"regex",
]
-[[package]]
-name = "addr2line"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
-dependencies = [
- "gimli 0.26.1",
-]
-
[[package]]
name = "addr2line"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
dependencies = [
- "gimli 0.27.0",
+ "gimli",
]
[[package]]
@@ -245,9 +236,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.69"
+version = "1.0.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
+checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
[[package]]
name = "approx"
@@ -272,9 +263,9 @@ checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6"
[[package]]
name = "array-bytes"
-version = "6.0.0"
+version = "6.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22f72e9d6fac4bc80778ea470b20197b88d28c292bb7d60c3fb099280003cd19"
+checksum = "d9b1c5a481ec30a5abd8dfbd94ab5cf1bb4e9a66be7f1b3b322f2f1170c200fd"
[[package]]
name = "arrayref"
@@ -361,19 +352,13 @@ dependencies = [
"syn 1.0.109",
]
-[[package]]
-name = "asn1_der"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21"
-
[[package]]
name = "assert_cmd"
-version = "2.0.10"
+version = "2.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0b2340f55d9661d76793b2bfc2eb0e62689bd79d067a95707ea762afd5e9dd"
+checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151"
dependencies = [
- "anstyle 0.3.4",
+ "anstyle 1.0.0",
"bstr 1.1.0",
"doc-comment",
"predicates 3.0.1",
@@ -410,6 +395,7 @@ dependencies = [
"pallet-xcm",
"parachain-info",
"parachains-common",
+ "parachains-runtimes-test-utils",
"parity-scale-codec",
"polkadot-parachain",
"sp-consensus-aura",
@@ -419,6 +405,7 @@ dependencies = [
"sp-std",
"substrate-wasm-builder",
"xcm",
+ "xcm-builder",
"xcm-executor",
]
@@ -488,7 +475,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
@@ -499,7 +486,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
@@ -544,12 +531,12 @@ version = "0.3.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
dependencies = [
- "addr2line 0.19.0",
+ "addr2line",
"cc",
"cfg-if",
"libc",
"miniz_oxide 0.6.2",
- "object 0.30.0",
+ "object",
"rustc-demangle",
]
@@ -577,6 +564,12 @@ version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+[[package]]
+name = "base64"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f1e31e207a6b8fb791a38ea3105e6cb541f55e4d029902d3039a4ad07cc4105"
+
[[package]]
name = "base64ct"
version = "1.5.2"
@@ -595,7 +588,7 @@ dependencies = [
[[package]]
name = "binary-merkle-tree"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"hash-db",
"log",
@@ -612,9 +605,9 @@ dependencies = [
[[package]]
name = "bindgen"
-version = "0.64.0"
+version = "0.65.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"
+checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
dependencies = [
"bitflags",
"cexpr",
@@ -622,12 +615,13 @@ dependencies = [
"lazy_static",
"lazycell",
"peeking_take_while",
+ "prettyplease",
"proc-macro2",
"quote",
"regex",
"rustc-hash",
"shlex",
- "syn 1.0.109",
+ "syn 2.0.16",
]
[[package]]
@@ -830,6 +824,7 @@ dependencies = [
name = "bp-messages"
version = "0.1.0"
dependencies = [
+ "bp-header-chain",
"bp-runtime",
"frame-support",
"hex",
@@ -928,13 +923,18 @@ name = "bp-test-utils"
version = "0.1.0"
dependencies = [
"bp-header-chain",
+ "bp-parachains",
+ "bp-polkadot-core",
+ "bp-runtime",
"ed25519-dalek",
"finality-grandpa",
"parity-scale-codec",
"sp-application-crypto",
"sp-consensus-grandpa",
+ "sp-core",
"sp-runtime",
"sp-std",
+ "sp-trie",
]
[[package]]
@@ -1146,6 +1146,7 @@ dependencies = [
"sp-core",
"sp-inherents",
"sp-io",
+ "sp-keyring",
"sp-offchain",
"sp-runtime",
"sp-session",
@@ -1163,29 +1164,42 @@ dependencies = [
name = "bridge-hub-test-utils"
version = "0.1.0"
dependencies = [
+ "assert_matches",
"asset-test-utils",
+ "bp-bridge-hub-rococo",
+ "bp-bridge-hub-wococo",
"bp-header-chain",
"bp-messages",
+ "bp-parachains",
"bp-polkadot-core",
+ "bp-relayers",
"bp-runtime",
"bp-test-utils",
"bridge-runtime-common",
"cumulus-pallet-dmp-queue",
"cumulus-pallet-parachain-system",
"cumulus-pallet-xcmp-queue",
+ "frame-benchmarking",
+ "frame-executive",
"frame-support",
"frame-system",
"log",
"pallet-balances",
"pallet-bridge-grandpa",
"pallet-bridge-messages",
+ "pallet-bridge-parachains",
+ "pallet-bridge-relayers",
"pallet-collator-selection",
"pallet-session",
+ "pallet-utility",
"pallet-xcm",
"pallet-xcm-benchmarks",
"parachain-info",
+ "parachains-runtimes-test-utils",
"parity-scale-codec",
+ "sp-core",
"sp-io",
+ "sp-keyring",
"sp-runtime",
"xcm",
"xcm-builder",
@@ -1214,7 +1228,6 @@ dependencies = [
"pallet-bridge-relayers",
"pallet-transaction-payment",
"pallet-utility",
- "pallet-xcm",
"parity-scale-codec",
"scale-info",
"sp-api",
@@ -1226,7 +1239,6 @@ dependencies = [
"static_assertions",
"xcm",
"xcm-builder",
- "xcm-executor",
]
[[package]]
@@ -1267,9 +1279,9 @@ dependencies = [
[[package]]
name = "bumpalo"
-version = "3.8.0"
+version = "3.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"
+checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
[[package]]
name = "byte-slice-cast"
@@ -1350,6 +1362,15 @@ dependencies = [
"thiserror",
]
+[[package]]
+name = "casey"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "614586263949597dcc18675da12ef9b429135e13628d92eb8b8c6fa50ca5656b"
+dependencies = [
+ "syn 1.0.109",
+]
+
[[package]]
name = "cast"
version = "0.3.0"
@@ -1387,9 +1408,9 @@ dependencies = [
[[package]]
name = "cfg-expr"
-version = "0.10.3"
+version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db"
+checksum = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9"
dependencies = [
"smallvec",
]
@@ -1479,7 +1500,7 @@ checksum = "f6ed9c8b2d17acb8110c46f1da5bf4a696d745e1474a16db0cd2b49cd0249bf2"
dependencies = [
"core2",
"multibase",
- "multihash",
+ "multihash 0.16.2",
"serde",
"unsigned-varint",
]
@@ -1524,21 +1545,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "3.2.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750"
-dependencies = [
- "bitflags",
- "clap_lex 0.2.2",
- "indexmap",
- "textwrap",
-]
-
-[[package]]
-name = "clap"
-version = "4.2.7"
+version = "4.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938"
+checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc"
dependencies = [
"clap_builder",
"clap_derive",
@@ -1547,43 +1556,34 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.2.7"
+version = "4.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd"
+checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990"
dependencies = [
"anstream",
"anstyle 1.0.0",
"bitflags",
- "clap_lex 0.4.1",
+ "clap_lex",
"strsim",
]
[[package]]
name = "clap_derive"
-version = "4.2.0"
+version = "4.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4"
+checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b"
dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.15",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5538cd660450ebeb4234cfecf8f2284b844ffc4c50531e66d584ad5b91293613"
-dependencies = [
- "os_str_bytes",
+ "syn 2.0.16",
]
[[package]]
name = "clap_lex"
-version = "0.4.1"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
[[package]]
name = "coarsetime"
@@ -1731,6 +1731,19 @@ dependencies = [
"crossbeam-utils",
]
+[[package]]
+name = "console"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60"
+dependencies = [
+ "encode_unicode",
+ "lazy_static",
+ "libc",
+ "unicode-width",
+ "windows-sys 0.42.0",
+]
+
[[package]]
name = "const-oid"
version = "0.9.2"
@@ -1879,28 +1892,27 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
[[package]]
name = "cranelift-bforest"
-version = "0.93.2"
+version = "0.95.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc42ba2e232e5b20ff7dc299a812d53337dadce9a7e39a238e6a5cb82d2e57b"
+checksum = "1277fbfa94bc82c8ec4af2ded3e639d49ca5f7f3c7eeab2c66accd135ece4e70"
dependencies = [
"cranelift-entity",
]
[[package]]
name = "cranelift-codegen"
-version = "0.93.2"
+version = "0.95.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "253531aca9b6f56103c9420369db3263e784df39aa1c90685a1f69cfbba0623e"
+checksum = "c6e8c31ad3b2270e9aeec38723888fe1b0ace3bea2b06b3f749ccf46661d3220"
dependencies = [
- "arrayvec 0.7.2",
"bumpalo",
"cranelift-bforest",
"cranelift-codegen-meta",
"cranelift-codegen-shared",
"cranelift-entity",
"cranelift-isle",
- "gimli 0.26.1",
- "hashbrown 0.12.3",
+ "gimli",
+ "hashbrown 0.13.2",
"log",
"regalloc2",
"smallvec",
@@ -1909,33 +1921,33 @@ dependencies = [
[[package]]
name = "cranelift-codegen-meta"
-version = "0.93.2"
+version = "0.95.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72f2154365e2bff1b1b8537a7181591fdff50d8e27fa6e40d5c69c3bad0ca7c8"
+checksum = "c8ac5ac30d62b2d66f12651f6b606dbdfd9c2cfd0908de6b387560a277c5c9da"
dependencies = [
"cranelift-codegen-shared",
]
[[package]]
name = "cranelift-codegen-shared"
-version = "0.93.2"
+version = "0.95.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "687e14e3f5775248930e0d5a84195abef8b829958e9794bf8d525104993612b4"
+checksum = "dd82b8b376247834b59ed9bdc0ddeb50f517452827d4a11bccf5937b213748b8"
[[package]]
name = "cranelift-entity"
-version = "0.93.2"
+version = "0.95.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f42ea692c7b450ad18b8c9889661505d51c09ec4380cf1c2d278dbb2da22cae1"
+checksum = "40099d38061b37e505e63f89bab52199037a72b931ad4868d9089ff7268660b0"
dependencies = [
"serde",
]
[[package]]
name = "cranelift-frontend"
-version = "0.93.2"
+version = "0.95.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8483c2db6f45fe9ace984e5adc5d058102227e4c62e5aa2054e16b0275fd3a6e"
+checksum = "64a25d9d0a0ae3079c463c34115ec59507b4707175454f0eee0891e83e30e82d"
dependencies = [
"cranelift-codegen",
"log",
@@ -1945,15 +1957,15 @@ dependencies = [
[[package]]
name = "cranelift-isle"
-version = "0.93.2"
+version = "0.95.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9793158837678902446c411741d87b43f57dadfb944f2440db4287cda8cbd59"
+checksum = "80de6a7d0486e4acbd5f9f87ec49912bf4c8fb6aea00087b989685460d4469ba"
[[package]]
name = "cranelift-native"
-version = "0.93.2"
+version = "0.95.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72668c7755f2b880665cb422c8ad2d56db58a88b9bebfef0b73edc2277c13c49"
+checksum = "bb6b03e0e03801c4b3fd8ce0758a94750c07a44e7944cc0ffbf0d3f2e7c79b00"
dependencies = [
"cranelift-codegen",
"libc",
@@ -1962,9 +1974,9 @@ dependencies = [
[[package]]
name = "cranelift-wasm"
-version = "0.93.2"
+version = "0.95.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3852ce4b088b44ac4e29459573943009a70d1b192c8d77ef949b4e814f656fc1"
+checksum = "ff3220489a3d928ad91e59dd7aeaa8b3de18afb554a6211213673a71c90737ac"
dependencies = [
"cranelift-codegen",
"cranelift-entity",
@@ -2002,20 +2014,20 @@ dependencies = [
[[package]]
name = "criterion"
-version = "0.4.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb"
+checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
dependencies = [
"anes",
- "atty",
"cast",
"ciborium",
- "clap 3.2.22",
+ "clap",
"criterion-plot",
"futures",
+ "is-terminal",
"itertools",
- "lazy_static",
"num-traits",
+ "once_cell",
"oorandom",
"plotters",
"rayon",
@@ -2183,7 +2195,7 @@ dependencies = [
name = "cumulus-client-cli"
version = "0.1.0"
dependencies = [
- "clap 4.2.7",
+ "clap",
"parity-scale-codec",
"sc-chain-spec",
"sc-cli",
@@ -2227,10 +2239,17 @@ name = "cumulus-client-consensus-aura"
version = "0.1.0"
dependencies = [
"async-trait",
+ "cumulus-client-collator",
"cumulus-client-consensus-common",
+ "cumulus-client-consensus-proposer",
"cumulus-primitives-core",
+ "cumulus-primitives-parachain-inherent",
+ "cumulus-relay-chain-interface",
"futures",
"parity-scale-codec",
+ "polkadot-node-primitives",
+ "polkadot-overseer",
+ "polkadot-primitives",
"sc-client-api",
"sc-consensus",
"sc-consensus-aura",
@@ -2246,6 +2265,8 @@ dependencies = [
"sp-inherents",
"sp-keystore",
"sp-runtime",
+ "sp-state-machine",
+ "sp-timestamp",
"substrate-prometheus-endpoint",
"tracing",
]
@@ -2270,12 +2291,28 @@ dependencies = [
"schnellru",
"sp-blockchain",
"sp-consensus",
+ "sp-core",
"sp-runtime",
"sp-tracing",
"sp-trie",
+ "substrate-prometheus-endpoint",
"tracing",
]
+[[package]]
+name = "cumulus-client-consensus-proposer"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "cumulus-primitives-parachain-inherent",
+ "sp-consensus",
+ "sp-inherents",
+ "sp-runtime",
+ "sp-state-machine",
+ "thiserror",
+]
+
[[package]]
name = "cumulus-client-consensus-relay-chain"
version = "0.1.0"
@@ -2470,7 +2507,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
@@ -2677,7 +2714,7 @@ dependencies = [
name = "cumulus-relay-chain-minimal-node"
version = "0.1.0"
dependencies = [
- "array-bytes 6.0.0",
+ "array-bytes 6.1.0",
"async-trait",
"cumulus-primitives-core",
"cumulus-relay-chain-interface",
@@ -2786,8 +2823,8 @@ dependencies = [
name = "cumulus-test-relay-validation-worker-provider"
version = "0.1.0"
dependencies = [
- "polkadot-node-core-pvf-worker",
- "toml 0.7.3",
+ "polkadot-node-core-pvf",
+ "toml 0.7.4",
]
[[package]]
@@ -2826,7 +2863,7 @@ name = "cumulus-test-service"
version = "0.1.0"
dependencies = [
"async-trait",
- "clap 4.2.7",
+ "clap",
"criterion",
"cumulus-client-cli",
"cumulus-client-consensus-common",
@@ -2920,7 +2957,7 @@ dependencies = [
"cfg-if",
"fiat-crypto",
"packed_simd_2",
- "platforms 3.0.2",
+ "platforms",
"subtle",
"zeroize",
]
@@ -3346,9 +3383,9 @@ dependencies = [
[[package]]
name = "either"
-version = "1.6.1"
+version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
[[package]]
name = "elliptic-curve"
@@ -3391,6 +3428,12 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "encode_unicode"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+
[[package]]
name = "enum-as-inner"
version = "0.5.1"
@@ -3420,18 +3463,18 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
name = "enumn"
-version = "0.1.5"
+version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038b1afa59052df211f9efd58f8b1d84c242935ede1c3dbaed26b018a9e06ae2"
+checksum = "48016319042fb7c87b78d2993084a831793a897a5cd1a2a67cab9d1eeb4b7d76"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.16",
]
[[package]]
@@ -3600,7 +3643,7 @@ dependencies = [
"fs-err",
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
@@ -3771,7 +3814,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "fork-tree"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"parity-scale-codec",
]
@@ -3794,7 +3837,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
[[package]]
name = "frame-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-support",
"frame-support-procedural",
@@ -3819,12 +3862,12 @@ dependencies = [
[[package]]
name = "frame-benchmarking-cli"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"Inflector",
"array-bytes 4.2.0",
"chrono",
- "clap 4.2.7",
+ "clap",
"comfy-table",
"frame-benchmarking",
"frame-support",
@@ -3866,18 +3909,18 @@ dependencies = [
[[package]]
name = "frame-election-provider-solution-type"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
name = "frame-election-provider-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-election-provider-solution-type",
"frame-support",
@@ -3894,7 +3937,7 @@ dependencies = [
[[package]]
name = "frame-executive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-support",
"frame-system",
@@ -3923,10 +3966,11 @@ dependencies = [
[[package]]
name = "frame-remote-externalities"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"async-recursion",
"futures",
+ "indicatif",
"jsonrpsee",
"log",
"parity-scale-codec",
@@ -3934,14 +3978,16 @@ dependencies = [
"sp-core",
"sp-io",
"sp-runtime",
+ "spinners",
"substrate-rpc-client",
"tokio",
+ "tokio-retry",
]
[[package]]
name = "frame-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"bitflags",
"environmental",
@@ -3960,6 +4006,7 @@ dependencies = [
"sp-arithmetic",
"sp-core",
"sp-core-hashing-proc-macro",
+ "sp-debug-derive",
"sp-inherents",
"sp-io",
"sp-runtime",
@@ -3974,7 +4021,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"Inflector",
"cfg-expr",
@@ -3984,36 +4031,37 @@ dependencies = [
"proc-macro-warning",
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
name = "frame-support-procedural-tools"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
name = "frame-support-procedural-tools-derive"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
name = "frame-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
+ "cfg-if",
"frame-support",
"log",
"parity-scale-codec",
@@ -4030,7 +4078,7 @@ dependencies = [
[[package]]
name = "frame-system-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4045,7 +4093,7 @@ dependencies = [
[[package]]
name = "frame-system-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -4054,7 +4102,7 @@ dependencies = [
[[package]]
name = "frame-try-runtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -4174,7 +4222,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
@@ -4307,21 +4355,15 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.26.1"
+version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
+checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793"
dependencies = [
"fallible-iterator",
"indexmap",
"stable_deref_trait",
]
-[[package]]
-name = "gimli"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793"
-
[[package]]
name = "glob"
version = "0.3.0"
@@ -4341,6 +4383,41 @@ dependencies = [
"regex",
]
+[[package]]
+name = "glutton-runtime"
+version = "1.0.0"
+dependencies = [
+ "cumulus-pallet-parachain-system",
+ "cumulus-pallet-xcm",
+ "cumulus-primitives-core",
+ "frame-benchmarking",
+ "frame-executive",
+ "frame-support",
+ "frame-system",
+ "frame-system-benchmarking",
+ "frame-try-runtime",
+ "pallet-glutton",
+ "pallet-sudo",
+ "parachain-info",
+ "parachains-common",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api",
+ "sp-block-builder",
+ "sp-core",
+ "sp-inherents",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-session",
+ "sp-std",
+ "sp-transaction-pool",
+ "sp-version",
+ "substrate-wasm-builder",
+ "xcm",
+ "xcm-builder",
+ "xcm-executor",
+]
+
[[package]]
name = "group"
version = "0.12.1"
@@ -4759,6 +4836,18 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590"
+[[package]]
+name = "indicatif"
+version = "0.17.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729"
+dependencies = [
+ "console",
+ "number_prefix",
+ "portable-atomic",
+ "unicode-width",
+]
+
[[package]]
name = "instant"
version = "0.1.12"
@@ -4783,6 +4872,47 @@ dependencies = [
"num-traits",
]
+[[package]]
+name = "integration-tests-common"
+version = "1.0.0"
+dependencies = [
+ "bridge-hub-kusama-runtime",
+ "bridge-hub-polkadot-runtime",
+ "collectives-polkadot-runtime",
+ "cumulus-primitives-core",
+ "frame-support",
+ "frame-system",
+ "kusama-runtime",
+ "kusama-runtime-constants",
+ "pallet-assets",
+ "pallet-balances",
+ "pallet-im-online",
+ "pallet-staking",
+ "pallet-xcm",
+ "parachain-info",
+ "parachains-common",
+ "parity-scale-codec",
+ "penpal-runtime",
+ "polkadot-core-primitives",
+ "polkadot-parachain",
+ "polkadot-primitives",
+ "polkadot-runtime",
+ "polkadot-runtime-constants",
+ "polkadot-runtime-parachains",
+ "polkadot-service",
+ "sc-consensus-grandpa",
+ "sp-authority-discovery",
+ "sp-consensus-babe",
+ "sp-core",
+ "sp-runtime",
+ "sp-weights",
+ "statemine-runtime",
+ "statemint-runtime",
+ "xcm",
+ "xcm-emulator",
+ "xcm-executor",
+]
+
[[package]]
name = "interceptor"
version = "0.8.2"
@@ -4886,9 +5016,9 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.55"
+version = "0.3.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
+checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
dependencies = [
"wasm-bindgen",
]
@@ -5059,7 +5189,7 @@ checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
[[package]]
name = "kusama-runtime"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"bitvec",
"frame-benchmarking",
@@ -5092,6 +5222,7 @@ dependencies = [
"pallet-im-online",
"pallet-indices",
"pallet-membership",
+ "pallet-message-queue",
"pallet-multisig",
"pallet-nis",
"pallet-nomination-pools",
@@ -5157,7 +5288,7 @@ dependencies = [
[[package]]
name = "kusama-runtime-constants"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -5189,9 +5320,9 @@ dependencies = [
[[package]]
name = "kvdb-rocksdb"
-version = "0.18.0"
+version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe7a749456510c45f795e8b04a6a3e0976d0139213ecbf465843830ad55e2217"
+checksum = "b644c70b92285f66bfc2032922a79000ea30af7bc2ab31902992a5dcb9b434f6"
dependencies = [
"kvdb",
"num_cpus",
@@ -5243,22 +5374,24 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
[[package]]
name = "libp2p"
-version = "0.50.0"
+version = "0.51.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e0a0d2f693675f49ded13c5d510c48b78069e23cbd9108d7ccd59f6dc568819"
+checksum = "f210d259724eae82005b5c48078619b7745edb7b76de370b03f8ba59ea103097"
dependencies = [
"bytes",
"futures",
"futures-timer",
"getrandom 0.2.8",
"instant",
+ "libp2p-allow-block-list",
+ "libp2p-connection-limits",
"libp2p-core",
"libp2p-dns",
"libp2p-identify",
+ "libp2p-identity",
"libp2p-kad",
"libp2p-mdns",
"libp2p-metrics",
- "libp2p-mplex",
"libp2p-noise",
"libp2p-ping",
"libp2p-quic",
@@ -5270,50 +5403,66 @@ dependencies = [
"libp2p-websocket",
"libp2p-yamux",
"multiaddr",
- "parking_lot 0.12.1",
"pin-project",
- "smallvec",
+]
+
+[[package]]
+name = "libp2p-allow-block-list"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "510daa05efbc25184458db837f6f9a5143888f1caa742426d92e1833ddd38a50"
+dependencies = [
+ "libp2p-core",
+ "libp2p-identity",
+ "libp2p-swarm",
+ "void",
+]
+
+[[package]]
+name = "libp2p-connection-limits"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4caa33f1d26ed664c4fe2cca81a08c8e07d4c1c04f2f4ac7655c2dd85467fda0"
+dependencies = [
+ "libp2p-core",
+ "libp2p-identity",
+ "libp2p-swarm",
+ "void",
]
[[package]]
name = "libp2p-core"
-version = "0.38.0"
+version = "0.39.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6a8fcd392ff67af6cc3f03b1426c41f7f26b6b9aff2dc632c1c56dd649e571f"
+checksum = "3c1df63c0b582aa434fb09b2d86897fa2b419ffeccf934b36f87fcedc8e835c2"
dependencies = [
- "asn1_der",
- "bs58",
- "ed25519-dalek",
"either",
"fnv",
"futures",
"futures-timer",
"instant",
+ "libp2p-identity",
"log",
"multiaddr",
- "multihash",
+ "multihash 0.17.0",
"multistream-select",
"once_cell",
"parking_lot 0.12.1",
"pin-project",
- "prost",
- "prost-build",
+ "quick-protobuf",
"rand 0.8.5",
"rw-stream-sink",
- "sec1 0.3.0",
- "sha2 0.10.2",
"smallvec",
"thiserror",
"unsigned-varint",
"void",
- "zeroize",
]
[[package]]
name = "libp2p-dns"
-version = "0.38.0"
+version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e42a271c1b49f789b92f7fc87749fa79ce5c7bdc88cbdfacb818a4bca47fec5"
+checksum = "146ff7034daae62077c415c2376b8057368042df6ab95f5432ad5e88568b1554"
dependencies = [
"futures",
"libp2p-core",
@@ -5325,30 +5474,49 @@ dependencies = [
[[package]]
name = "libp2p-identify"
-version = "0.41.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c052d0026f4817b44869bfb6810f4e1112f43aec8553f2cb38881c524b563abf"
+checksum = "5455f472243e63b9c497ff320ded0314254a9eb751799a39c283c6f20b793f3c"
dependencies = [
"asynchronous-codec",
+ "either",
"futures",
"futures-timer",
"libp2p-core",
+ "libp2p-identity",
"libp2p-swarm",
"log",
- "lru 0.8.1",
- "prost",
- "prost-build",
- "prost-codec",
+ "lru 0.10.0",
+ "quick-protobuf",
+ "quick-protobuf-codec",
"smallvec",
"thiserror",
"void",
]
+[[package]]
+name = "libp2p-identity"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e2d584751cecb2aabaa56106be6be91338a60a0f4e420cf2af639204f596fc1"
+dependencies = [
+ "bs58",
+ "ed25519-dalek",
+ "log",
+ "multiaddr",
+ "multihash 0.17.0",
+ "quick-protobuf",
+ "rand 0.8.5",
+ "sha2 0.10.2",
+ "thiserror",
+ "zeroize",
+]
+
[[package]]
name = "libp2p-kad"
-version = "0.42.1"
+version = "0.43.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2766dcd2be8c87d5e1f35487deb22d765f49c6ae1251b3633efe3b25698bd3d2"
+checksum = "39d5ef876a2b2323d63c258e63c2f8e36f205fe5a11f0b3095d59635650790ff"
dependencies = [
"arrayvec 0.7.2",
"asynchronous-codec",
@@ -5359,10 +5527,10 @@ dependencies = [
"futures-timer",
"instant",
"libp2p-core",
+ "libp2p-identity",
"libp2p-swarm",
"log",
- "prost",
- "prost-build",
+ "quick-protobuf",
"rand 0.8.5",
"sha2 0.10.2",
"smallvec",
@@ -5374,14 +5542,15 @@ dependencies = [
[[package]]
name = "libp2p-mdns"
-version = "0.42.0"
+version = "0.43.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04f378264aade9872d6ccd315c0accc18be3a35d15fc1b9c36e5b6f983b62b5b"
+checksum = "19983e1f949f979a928f2c603de1cf180cc0dc23e4ac93a62651ccb18341460b"
dependencies = [
"data-encoding",
"futures",
"if-watch",
"libp2p-core",
+ "libp2p-identity",
"libp2p-swarm",
"log",
"rand 0.8.5",
@@ -5394,9 +5563,9 @@ dependencies = [
[[package]]
name = "libp2p-metrics"
-version = "0.11.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ad8a64f29da86005c86a4d2728b8a0719e9b192f4092b609fd8790acb9dec55"
+checksum = "a42ec91e227d7d0dafa4ce88b333cdf5f277253873ab087555c92798db2ddd46"
dependencies = [
"libp2p-core",
"libp2p-identify",
@@ -5406,38 +5575,20 @@ dependencies = [
"prometheus-client",
]
-[[package]]
-name = "libp2p-mplex"
-version = "0.38.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03805b44107aa013e7cbbfa5627b31c36cbedfdfb00603c0311998882bc4bace"
-dependencies = [
- "asynchronous-codec",
- "bytes",
- "futures",
- "libp2p-core",
- "log",
- "nohash-hasher",
- "parking_lot 0.12.1",
- "rand 0.8.5",
- "smallvec",
- "unsigned-varint",
-]
-
[[package]]
name = "libp2p-noise"
-version = "0.41.0"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a978cb57efe82e892ec6f348a536bfbd9fee677adbe5689d7a93ad3a9bffbf2e"
+checksum = "9c3673da89d29936bc6435bafc638e2f184180d554ce844db65915113f86ec5e"
dependencies = [
"bytes",
"curve25519-dalek 3.2.0",
"futures",
"libp2p-core",
+ "libp2p-identity",
"log",
"once_cell",
- "prost",
- "prost-build",
+ "quick-protobuf",
"rand 0.8.5",
"sha2 0.10.2",
"snow",
@@ -5449,10 +5600,11 @@ dependencies = [
[[package]]
name = "libp2p-ping"
-version = "0.41.0"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "929fcace45a112536e22b3dcfd4db538723ef9c3cb79f672b98be2cc8e25f37f"
+checksum = "3e57759c19c28a73ef1eb3585ca410cefb72c1a709fcf6de1612a378e4219202"
dependencies = [
+ "either",
"futures",
"futures-timer",
"instant",
@@ -5465,15 +5617,16 @@ dependencies = [
[[package]]
name = "libp2p-quic"
-version = "0.7.0-alpha"
+version = "0.7.0-alpha.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01e7c867e95c8130667b24409d236d37598270e6da69b3baf54213ba31ffca59"
+checksum = "c6b26abd81cd2398382a1edfe739b539775be8a90fa6914f39b2ab49571ec735"
dependencies = [
"bytes",
"futures",
"futures-timer",
"if-watch",
"libp2p-core",
+ "libp2p-identity",
"libp2p-tls",
"log",
"parking_lot 0.12.1",
@@ -5486,27 +5639,25 @@ dependencies = [
[[package]]
name = "libp2p-request-response"
-version = "0.23.0"
+version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3236168796727bfcf4927f766393415361e2c644b08bedb6a6b13d957c9a4884"
+checksum = "7ffdb374267d42dc5ed5bc53f6e601d4a64ac5964779c6e40bb9e4f14c1e30d5"
dependencies = [
"async-trait",
- "bytes",
"futures",
"instant",
"libp2p-core",
+ "libp2p-identity",
"libp2p-swarm",
- "log",
"rand 0.8.5",
"smallvec",
- "unsigned-varint",
]
[[package]]
name = "libp2p-swarm"
-version = "0.41.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2a35472fe3276b3855c00f1c032ea8413615e030256429ad5349cdf67c6e1a0"
+checksum = "903b3d592d7694e56204d211f29d31bc004be99386644ba8731fc3e3ef27b296"
dependencies = [
"either",
"fnv",
@@ -5514,21 +5665,20 @@ dependencies = [
"futures-timer",
"instant",
"libp2p-core",
+ "libp2p-identity",
"libp2p-swarm-derive",
"log",
- "pin-project",
"rand 0.8.5",
"smallvec",
- "thiserror",
"tokio",
"void",
]
[[package]]
name = "libp2p-swarm-derive"
-version = "0.31.0"
+version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d527d5827582abd44a6d80c07ff8b50b4ee238a8979e05998474179e79dc400"
+checksum = "0fba456131824ab6acd4c7bf61e9c0f0a3014b5fc9868ccb8e10d344594cdc4f"
dependencies = [
"heck",
"quote",
@@ -5537,9 +5687,9 @@ dependencies = [
[[package]]
name = "libp2p-tcp"
-version = "0.38.0"
+version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b257baf6df8f2df39678b86c578961d48cc8b68642a12f0f763f56c8e5858d"
+checksum = "33d33698596d7722d85d3ab0c86c2c322254fce1241e91208e3679b4eb3026cf"
dependencies = [
"futures",
"futures-timer",
@@ -5553,13 +5703,14 @@ dependencies = [
[[package]]
name = "libp2p-tls"
-version = "0.1.0-alpha"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7905ce0d040576634e8a3229a7587cc8beab83f79db6023800f1792895defa8"
+checksum = "ff08d13d0dc66e5e9ba6279c1de417b84fa0d0adc3b03e5732928c180ec02781"
dependencies = [
"futures",
"futures-rustls",
"libp2p-core",
+ "libp2p-identity",
"rcgen 0.10.0",
"ring",
"rustls 0.20.7",
@@ -5571,9 +5722,9 @@ dependencies = [
[[package]]
name = "libp2p-wasm-ext"
-version = "0.38.0"
+version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bb1a35299860e0d4b3c02a3e74e3b293ad35ae0cee8a056363b0c862d082069"
+checksum = "77dff9d32353a5887adb86c8afc1de1a94d9e8c3bc6df8b2201d7cdf5c848f43"
dependencies = [
"futures",
"js-sys",
@@ -5585,9 +5736,9 @@ dependencies = [
[[package]]
name = "libp2p-webrtc"
-version = "0.4.0-alpha"
+version = "0.4.0-alpha.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb6cd86dd68cba72308ea05de1cebf3ba0ae6e187c40548167955d4e3970f6a"
+checksum = "dba48592edbc2f60b4bc7c10d65445b0c3964c07df26fdf493b6880d33be36f8"
dependencies = [
"async-trait",
"asynchronous-codec",
@@ -5597,12 +5748,12 @@ dependencies = [
"hex",
"if-watch",
"libp2p-core",
+ "libp2p-identity",
"libp2p-noise",
"log",
- "multihash",
- "prost",
- "prost-build",
- "prost-codec",
+ "multihash 0.17.0",
+ "quick-protobuf",
+ "quick-protobuf-codec",
"rand 0.8.5",
"rcgen 0.9.3",
"serde",
@@ -5616,9 +5767,9 @@ dependencies = [
[[package]]
name = "libp2p-websocket"
-version = "0.40.0"
+version = "0.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d705506030d5c0aaf2882437c70dab437605f21c5f9811978f694e6917a3b54"
+checksum = "111273f7b3d3510524c752e8b7a5314b7f7a1fee7e68161c01a7d72cbb06db9f"
dependencies = [
"either",
"futures",
@@ -5635,23 +5786,22 @@ dependencies = [
[[package]]
name = "libp2p-yamux"
-version = "0.42.0"
+version = "0.43.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f63594a0aa818642d9d4915c791945053877253f08a3626f13416b5cd928a29"
+checksum = "4dcd21d950662700a385d4c6d68e2f5f54d778e97068cdd718522222ef513bda"
dependencies = [
"futures",
"libp2p-core",
"log",
- "parking_lot 0.12.1",
"thiserror",
"yamux",
]
[[package]]
name = "librocksdb-sys"
-version = "0.10.0+7.9.2"
+version = "0.11.0+8.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fe4d5874f5ff2bc616e55e8c6086d478fcda13faf9495768a4aa1c22042d30b"
+checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e"
dependencies = [
"bindgen",
"bzip2-sys",
@@ -5669,7 +5819,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0452aac8bab02242429380e9b2f94ea20cea2b37e2c1777a1358799bbe97f37"
dependencies = [
"arrayref",
- "base64",
+ "base64 0.13.0",
"digest 0.9.0",
"hmac-drbg",
"libsecp256k1-core",
@@ -5808,6 +5958,15 @@ dependencies = [
"hashbrown 0.13.2",
]
+[[package]]
+name = "lru"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03f1160296536f10c833a82dca22267d5486734230d47bf00bf435885814ba1e"
+dependencies = [
+ "hashbrown 0.13.2",
+]
+
[[package]]
name = "lru-cache"
version = "0.1.2"
@@ -5933,6 +6092,15 @@ dependencies = [
"autocfg",
]
+[[package]]
+name = "memoffset"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
+dependencies = [
+ "autocfg",
+]
+
[[package]]
name = "memory-db"
version = "0.32.0"
@@ -5942,12 +6110,6 @@ dependencies = [
"hash-db",
]
-[[package]]
-name = "memory_units"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
-
[[package]]
name = "merlin"
version = "2.0.1"
@@ -6025,7 +6187,7 @@ dependencies = [
[[package]]
name = "mmr-gadget"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"futures",
"log",
@@ -6044,7 +6206,7 @@ dependencies = [
[[package]]
name = "mmr-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"anyhow",
"jsonrpsee",
@@ -6086,15 +6248,16 @@ dependencies = [
[[package]]
name = "multiaddr"
-version = "0.16.0"
+version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4aebdb21e90f81d13ed01dc84123320838e53963c2ca94b60b305d3fa64f31e"
+checksum = "2b36f567c7099511fa8612bbbb52dda2419ce0bdbacf31714e3a5ffdb766d3bd"
dependencies = [
"arrayref",
"byteorder",
"data-encoding",
+ "log",
"multibase",
- "multihash",
+ "multihash 0.17.0",
"percent-encoding",
"serde",
"static_assertions",
@@ -6130,6 +6293,19 @@ dependencies = [
"unsigned-varint",
]
+[[package]]
+name = "multihash"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40"
+dependencies = [
+ "core2",
+ "digest 0.10.6",
+ "multihash-derive",
+ "sha2 0.10.2",
+ "unsigned-varint",
+]
+
[[package]]
name = "multihash-derive"
version = "0.8.0"
@@ -6393,23 +6569,20 @@ dependencies = [
]
[[package]]
-name = "object"
-version = "0.29.0"
+name = "number_prefix"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
-dependencies = [
- "crc32fast",
- "hashbrown 0.12.3",
- "indexmap",
- "memchr",
-]
+checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
[[package]]
name = "object"
-version = "0.30.0"
+version = "0.30.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239da7f290cfa979f43f85a8efeee9a8a76d0827c356d37f9d3d7254d6b537fb"
+checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439"
dependencies = [
+ "crc32fast",
+ "hashbrown 0.13.2",
+ "indexmap",
"memchr",
]
@@ -6433,9 +6606,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.17.0"
+version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
+checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
[[package]]
name = "oorandom"
@@ -6502,12 +6675,6 @@ dependencies = [
"num-traits",
]
-[[package]]
-name = "os_str_bytes"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
-
[[package]]
name = "p256"
version = "0.11.1"
@@ -6543,7 +6710,7 @@ dependencies = [
[[package]]
name = "pallet-alliance"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"array-bytes 4.2.0",
"frame-benchmarking",
@@ -6564,7 +6731,7 @@ dependencies = [
[[package]]
name = "pallet-asset-tx-payment"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6582,7 +6749,7 @@ dependencies = [
[[package]]
name = "pallet-assets"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6597,7 +6764,7 @@ dependencies = [
[[package]]
name = "pallet-aura"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-support",
"frame-system",
@@ -6613,7 +6780,7 @@ dependencies = [
[[package]]
name = "pallet-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-support",
"frame-system",
@@ -6629,7 +6796,7 @@ dependencies = [
[[package]]
name = "pallet-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-support",
"frame-system",
@@ -6643,7 +6810,7 @@ dependencies = [
[[package]]
name = "pallet-babe"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6667,7 +6834,7 @@ dependencies = [
[[package]]
name = "pallet-bags-list"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -6687,7 +6854,7 @@ dependencies = [
[[package]]
name = "pallet-balances"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6702,7 +6869,7 @@ dependencies = [
[[package]]
name = "pallet-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-support",
"frame-system",
@@ -6721,7 +6888,7 @@ dependencies = [
[[package]]
name = "pallet-beefy-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"array-bytes 4.2.0",
"binary-merkle-tree",
@@ -6745,7 +6912,7 @@ dependencies = [
[[package]]
name = "pallet-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6873,7 +7040,7 @@ dependencies = [
[[package]]
name = "pallet-child-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6917,7 +7084,7 @@ dependencies = [
[[package]]
name = "pallet-collective"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6934,7 +7101,7 @@ dependencies = [
[[package]]
name = "pallet-contracts"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"bitflags",
"environmental",
@@ -6957,14 +7124,14 @@ dependencies = [
"sp-runtime",
"sp-std",
"wasm-instrument 0.4.0",
- "wasmi 0.28.0",
+ "wasmi",
"wasmparser-nostd",
]
[[package]]
name = "pallet-contracts-primitives"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"bitflags",
"parity-scale-codec",
@@ -6977,17 +7144,17 @@ dependencies = [
[[package]]
name = "pallet-contracts-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
name = "pallet-conviction-voting"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"assert_matches",
"frame-benchmarking",
@@ -7004,7 +7171,7 @@ dependencies = [
[[package]]
name = "pallet-democracy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7022,7 +7189,7 @@ dependencies = [
[[package]]
name = "pallet-election-provider-multi-phase"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -7045,7 +7212,7 @@ dependencies = [
[[package]]
name = "pallet-election-provider-support-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -7058,7 +7225,7 @@ dependencies = [
[[package]]
name = "pallet-elections-phragmen"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7076,7 +7243,7 @@ dependencies = [
[[package]]
name = "pallet-fast-unstake"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -7091,10 +7258,28 @@ dependencies = [
"sp-std",
]
+[[package]]
+name = "pallet-glutton"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
+dependencies = [
+ "blake2",
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
[[package]]
name = "pallet-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7117,7 +7302,7 @@ dependencies = [
[[package]]
name = "pallet-identity"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -7133,7 +7318,7 @@ dependencies = [
[[package]]
name = "pallet-im-online"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7153,7 +7338,7 @@ dependencies = [
[[package]]
name = "pallet-indices"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7170,7 +7355,7 @@ dependencies = [
[[package]]
name = "pallet-insecure-randomness-collective-flip"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-support",
"frame-system",
@@ -7184,7 +7369,24 @@ dependencies = [
[[package]]
name = "pallet-membership"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "pallet-message-queue"
+version = "7.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7192,16 +7394,18 @@ dependencies = [
"log",
"parity-scale-codec",
"scale-info",
+ "sp-arithmetic",
"sp-core",
"sp-io",
"sp-runtime",
"sp-std",
+ "sp-weights",
]
[[package]]
name = "pallet-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7218,7 +7422,7 @@ dependencies = [
[[package]]
name = "pallet-multisig"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7231,10 +7435,27 @@ dependencies = [
"sp-std",
]
+[[package]]
+name = "pallet-nft-fractionalization"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
+ "pallet-assets",
+ "pallet-nfts",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-runtime",
+ "sp-std",
+]
+
[[package]]
name = "pallet-nfts"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -7252,7 +7473,7 @@ dependencies = [
[[package]]
name = "pallet-nfts-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-support",
"pallet-nfts",
@@ -7263,7 +7484,7 @@ dependencies = [
[[package]]
name = "pallet-nis"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7279,7 +7500,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools"
version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-support",
"frame-system",
@@ -7296,7 +7517,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools-benchmarking"
version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -7316,7 +7537,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools-runtime-api"
version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"pallet-nomination-pools",
"parity-scale-codec",
@@ -7327,7 +7548,7 @@ dependencies = [
[[package]]
name = "pallet-offences"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-support",
"frame-system",
@@ -7344,7 +7565,7 @@ dependencies = [
[[package]]
name = "pallet-offences-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -7365,10 +7586,25 @@ dependencies = [
"sp-std",
]
+[[package]]
+name = "pallet-parachain-template"
+version = "0.1.0"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+]
+
[[package]]
name = "pallet-preimage"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7385,7 +7621,7 @@ dependencies = [
[[package]]
name = "pallet-proxy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7400,7 +7636,7 @@ dependencies = [
[[package]]
name = "pallet-ranked-collective"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7418,7 +7654,7 @@ dependencies = [
[[package]]
name = "pallet-recovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7433,7 +7669,7 @@ dependencies = [
[[package]]
name = "pallet-referenda"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"assert_matches",
"frame-benchmarking",
@@ -7452,7 +7688,7 @@ dependencies = [
[[package]]
name = "pallet-scheduler"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7469,7 +7705,7 @@ dependencies = [
[[package]]
name = "pallet-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-support",
"frame-system",
@@ -7490,7 +7726,7 @@ dependencies = [
[[package]]
name = "pallet-session-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7506,7 +7742,7 @@ dependencies = [
[[package]]
name = "pallet-society"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-support",
"frame-system",
@@ -7520,7 +7756,7 @@ dependencies = [
[[package]]
name = "pallet-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -7543,18 +7779,18 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-curve"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
name = "pallet-staking-reward-fn"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"log",
"sp-arithmetic",
@@ -7563,7 +7799,7 @@ dependencies = [
[[package]]
name = "pallet-staking-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -7572,7 +7808,7 @@ dependencies = [
[[package]]
name = "pallet-state-trie-migration"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7589,36 +7825,22 @@ dependencies = [
[[package]]
name = "pallet-sudo"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
-dependencies = [
- "frame-support",
- "frame-system",
- "parity-scale-codec",
- "scale-info",
- "sp-io",
- "sp-runtime",
- "sp-std",
-]
-
-[[package]]
-name = "pallet-template"
-version = "0.1.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
"parity-scale-codec",
"scale-info",
- "serde",
- "sp-core",
"sp-io",
"sp-runtime",
+ "sp-std",
]
[[package]]
name = "pallet-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7636,7 +7858,7 @@ dependencies = [
[[package]]
name = "pallet-tips"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7655,7 +7877,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-support",
"frame-system",
@@ -7671,7 +7893,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"jsonrpsee",
"pallet-transaction-payment-rpc-runtime-api",
@@ -7687,7 +7909,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"pallet-transaction-payment",
"parity-scale-codec",
@@ -7699,7 +7921,7 @@ dependencies = [
[[package]]
name = "pallet-treasury"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7716,7 +7938,7 @@ dependencies = [
[[package]]
name = "pallet-uniques"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7731,7 +7953,7 @@ dependencies = [
[[package]]
name = "pallet-utility"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7747,7 +7969,7 @@ dependencies = [
[[package]]
name = "pallet-vesting"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7762,7 +7984,7 @@ dependencies = [
[[package]]
name = "pallet-whitelist"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7777,7 +7999,7 @@ dependencies = [
[[package]]
name = "pallet-xcm"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"bounded-collections",
"frame-benchmarking",
@@ -7798,7 +8020,7 @@ dependencies = [
[[package]]
name = "pallet-xcm-benchmarks"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7829,7 +8051,7 @@ dependencies = [
name = "parachain-template-node"
version = "0.1.0"
dependencies = [
- "clap 4.2.7",
+ "clap",
"color-print",
"cumulus-client-cli",
"cumulus-client-consensus-aura",
@@ -7905,9 +8127,9 @@ dependencies = [
"pallet-authorship",
"pallet-balances",
"pallet-collator-selection",
+ "pallet-parachain-template",
"pallet-session",
"pallet-sudo",
- "pallet-template",
"pallet-timestamp",
"pallet-transaction-payment",
"pallet-transaction-payment-rpc-runtime-api",
@@ -7961,6 +8183,39 @@ dependencies = [
"xcm-executor",
]
+[[package]]
+name = "parachains-runtimes-test-utils"
+version = "1.0.0"
+dependencies = [
+ "assets-common",
+ "cumulus-pallet-dmp-queue",
+ "cumulus-pallet-parachain-system",
+ "cumulus-pallet-xcmp-queue",
+ "cumulus-primitives-core",
+ "cumulus-primitives-parachain-inherent",
+ "cumulus-test-relay-sproof-builder",
+ "frame-support",
+ "frame-system",
+ "hex-literal 0.3.4",
+ "pallet-assets",
+ "pallet-balances",
+ "pallet-collator-selection",
+ "pallet-session",
+ "pallet-xcm",
+ "parachain-info",
+ "parachains-common",
+ "parity-scale-codec",
+ "polkadot-parachain",
+ "sp-consensus-aura",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+ "substrate-wasm-builder",
+ "xcm",
+ "xcm-executor",
+]
+
[[package]]
name = "parity-bytes"
version = "0.1.2"
@@ -7969,9 +8224,9 @@ checksum = "16b56e3a2420138bdb970f84dfb9c774aea80fa0e7371549eedec0d80c209c67"
[[package]]
name = "parity-db"
-version = "0.4.6"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00bfb81cf5c90a222db2fb7b3a7cbf8cc7f38dfb6647aca4d98edf8281f56ed5"
+checksum = "4890dcb9556136a4ec2b0c51fa4a08c8b733b829506af8fff2e853f3a065985b"
dependencies = [
"blake2",
"crc32fast",
@@ -7989,9 +8244,9 @@ dependencies = [
[[package]]
name = "parity-scale-codec"
-version = "3.4.0"
+version = "3.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "637935964ff85a605d114591d4d2c13c5d1ba2806dae97cea6bf180238a749ac"
+checksum = "5ddb756ca205bd108aee3c62c6d3c994e1df84a59b9d6d4a5ea42ee1fd5a9a28"
dependencies = [
"arrayvec 0.7.2",
"bitvec",
@@ -8109,6 +8364,12 @@ dependencies = [
"windows-sys 0.32.0",
]
+[[package]]
+name = "partial_sort"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7924d1d0ad836f665c9065e26d016c673ece3993f30d340068b16f282afc1156"
+
[[package]]
name = "paste"
version = "1.0.12"
@@ -8145,7 +8406,7 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4"
dependencies = [
- "base64",
+ "base64 0.13.0",
]
[[package]]
@@ -8339,12 +8600,6 @@ version = "0.3.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f"
-[[package]]
-name = "platforms"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94"
-
[[package]]
name = "platforms"
version = "3.0.2"
@@ -8382,7 +8637,7 @@ dependencies = [
[[package]]
name = "polkadot-approval-distribution"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"futures",
"polkadot-node-jaeger",
@@ -8398,7 +8653,7 @@ dependencies = [
[[package]]
name = "polkadot-availability-bitfield-distribution"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"futures",
"polkadot-node-network-protocol",
@@ -8412,7 +8667,7 @@ dependencies = [
[[package]]
name = "polkadot-availability-distribution"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"derive_more",
"fatality",
@@ -8435,7 +8690,7 @@ dependencies = [
[[package]]
name = "polkadot-availability-recovery"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"fatality",
"futures",
@@ -8456,14 +8711,15 @@ dependencies = [
[[package]]
name = "polkadot-cli"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
- "clap 4.2.7",
+ "clap",
"frame-benchmarking-cli",
"futures",
"log",
"polkadot-client",
- "polkadot-node-core-pvf-worker",
+ "polkadot-node-core-pvf-execute-worker",
+ "polkadot-node-core-pvf-prepare-worker",
"polkadot-node-metrics",
"polkadot-performance-test",
"polkadot-service",
@@ -8485,7 +8741,7 @@ dependencies = [
[[package]]
name = "polkadot-client"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"async-trait",
"frame-benchmarking",
@@ -8528,7 +8784,7 @@ dependencies = [
[[package]]
name = "polkadot-collator-protocol"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"always-assert",
"bitvec",
@@ -8550,7 +8806,7 @@ dependencies = [
[[package]]
name = "polkadot-core-primitives"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -8562,7 +8818,7 @@ dependencies = [
[[package]]
name = "polkadot-dispute-distribution"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"derive_more",
"fatality",
@@ -8587,7 +8843,7 @@ dependencies = [
[[package]]
name = "polkadot-erasure-coding"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"parity-scale-codec",
"polkadot-node-primitives",
@@ -8601,7 +8857,7 @@ dependencies = [
[[package]]
name = "polkadot-gossip-support"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"futures",
"futures-timer",
@@ -8621,7 +8877,7 @@ dependencies = [
[[package]]
name = "polkadot-network-bridge"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"always-assert",
"async-trait",
@@ -8644,7 +8900,7 @@ dependencies = [
[[package]]
name = "polkadot-node-collation-generation"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"futures",
"parity-scale-codec",
@@ -8662,7 +8918,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-approval-voting"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"bitvec",
"derive_more",
@@ -8691,7 +8947,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-av-store"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"bitvec",
"futures",
@@ -8712,7 +8968,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-backing"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"bitvec",
"fatality",
@@ -8731,7 +8987,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-bitfield-signing"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"futures",
"polkadot-node-subsystem",
@@ -8746,7 +9002,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-candidate-validation"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"async-trait",
"futures",
@@ -8766,7 +9022,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-chain-api"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"futures",
"polkadot-node-metrics",
@@ -8781,7 +9037,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-chain-selection"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"futures",
"futures-timer",
@@ -8798,7 +9054,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-dispute-coordinator"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"fatality",
"futures",
@@ -8817,7 +9073,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-parachains-inherent"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"async-trait",
"futures",
@@ -8834,7 +9090,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-provisioner"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"bitvec",
"fatality",
@@ -8852,7 +9108,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-pvf"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"always-assert",
"futures",
@@ -8861,6 +9117,9 @@ dependencies = [
"parity-scale-codec",
"pin-project",
"polkadot-core-primitives",
+ "polkadot-node-core-pvf-common",
+ "polkadot-node-core-pvf-execute-worker",
+ "polkadot-node-core-pvf-prepare-worker",
"polkadot-node-metrics",
"polkadot-node-primitives",
"polkadot-parachain",
@@ -8872,6 +9131,7 @@ dependencies = [
"sp-tracing",
"sp-wasm-interface",
"substrate-build-script-utils",
+ "tempfile",
"tokio",
"tracing-gum",
]
@@ -8879,7 +9139,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-pvf-checker"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"futures",
"polkadot-node-primitives",
@@ -8893,16 +9153,34 @@ dependencies = [
]
[[package]]
-name = "polkadot-node-core-pvf-worker"
+name = "polkadot-node-core-pvf-common"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
- "assert_matches",
"cpu-time",
"futures",
"libc",
"parity-scale-codec",
- "polkadot-node-core-pvf",
+ "polkadot-parachain",
+ "polkadot-primitives",
+ "sc-executor-common",
+ "sc-executor-wasmtime",
+ "sp-core",
+ "sp-tracing",
+ "substrate-build-script-utils",
+ "tokio",
+ "tracing-gum",
+]
+
+[[package]]
+name = "polkadot-node-core-pvf-execute-worker"
+version = "0.9.41"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
+dependencies = [
+ "cpu-time",
+ "futures",
+ "parity-scale-codec",
+ "polkadot-node-core-pvf-common",
"polkadot-parachain",
"polkadot-primitives",
"rayon",
@@ -8914,8 +9192,29 @@ dependencies = [
"sp-io",
"sp-maybe-compressed-blob",
"sp-tracing",
- "substrate-build-script-utils",
- "tempfile",
+ "tikv-jemalloc-ctl",
+ "tokio",
+ "tracing-gum",
+]
+
+[[package]]
+name = "polkadot-node-core-pvf-prepare-worker"
+version = "0.9.41"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
+dependencies = [
+ "futures",
+ "libc",
+ "parity-scale-codec",
+ "polkadot-node-core-pvf-common",
+ "polkadot-parachain",
+ "polkadot-primitives",
+ "rayon",
+ "sc-executor",
+ "sc-executor-common",
+ "sc-executor-wasmtime",
+ "sp-io",
+ "sp-maybe-compressed-blob",
+ "sp-tracing",
"tikv-jemalloc-ctl",
"tokio",
"tracing-gum",
@@ -8924,7 +9223,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-runtime-api"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"futures",
"lru 0.9.0",
@@ -8939,7 +9238,7 @@ dependencies = [
[[package]]
name = "polkadot-node-jaeger"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"lazy_static",
"log",
@@ -8957,7 +9256,7 @@ dependencies = [
[[package]]
name = "polkadot-node-metrics"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"bs58",
"futures",
@@ -8976,8 +9275,9 @@ dependencies = [
[[package]]
name = "polkadot-node-network-protocol"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
+ "async-channel",
"async-trait",
"derive_more",
"fatality",
@@ -8998,7 +9298,7 @@ dependencies = [
[[package]]
name = "polkadot-node-primitives"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"bounded-vec",
"futures",
@@ -9020,7 +9320,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"polkadot-node-jaeger",
"polkadot-node-subsystem-types",
@@ -9030,7 +9330,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-test-helpers"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"async-trait",
"futures",
@@ -9048,7 +9348,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-types"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"async-trait",
"derive_more",
@@ -9071,7 +9371,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-util"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"async-trait",
"derive_more",
@@ -9104,7 +9404,7 @@ dependencies = [
[[package]]
name = "polkadot-overseer"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"async-trait",
"futures",
@@ -9127,7 +9427,7 @@ dependencies = [
[[package]]
name = "polkadot-parachain"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"bounded-collections",
"derive_more",
@@ -9143,14 +9443,14 @@ dependencies = [
[[package]]
name = "polkadot-parachain-bin"
-version = "0.9.400"
+version = "0.9.420"
dependencies = [
"assert_cmd",
"async-trait",
"bridge-hub-kusama-runtime",
"bridge-hub-polkadot-runtime",
"bridge-hub-rococo-runtime",
- "clap 4.2.7",
+ "clap",
"collectives-polkadot-runtime",
"color-print",
"contracts-rococo-runtime",
@@ -9165,6 +9465,7 @@ dependencies = [
"frame-benchmarking",
"frame-benchmarking-cli",
"futures",
+ "glutton-runtime",
"hex-literal 0.4.1",
"jsonrpsee",
"log",
@@ -9194,6 +9495,7 @@ dependencies = [
"sc-transaction-pool-api",
"seedling-runtime",
"serde",
+ "serde_json",
"shell-runtime",
"snowbridge-outbound-queue-rpc",
"sp-api",
@@ -9205,7 +9507,6 @@ dependencies = [
"sp-keystore",
"sp-offchain",
"sp-runtime",
- "sp-serializer",
"sp-session",
"sp-timestamp",
"sp-transaction-pool",
@@ -9226,13 +9527,13 @@ dependencies = [
[[package]]
name = "polkadot-performance-test"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"env_logger 0.9.0",
"kusama-runtime",
"log",
"polkadot-erasure-coding",
- "polkadot-node-core-pvf-worker",
+ "polkadot-node-core-pvf-prepare-worker",
"polkadot-node-primitives",
"polkadot-primitives",
"quote",
@@ -9244,7 +9545,7 @@ dependencies = [
[[package]]
name = "polkadot-primitives"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"bitvec",
"hex-literal 0.4.1",
@@ -9270,7 +9571,7 @@ dependencies = [
[[package]]
name = "polkadot-rpc"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"jsonrpsee",
"mmr-rpc",
@@ -9302,7 +9603,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"bitvec",
"frame-benchmarking",
@@ -9334,6 +9635,7 @@ dependencies = [
"pallet-im-online",
"pallet-indices",
"pallet-membership",
+ "pallet-message-queue",
"pallet-multisig",
"pallet-nomination-pools",
"pallet-nomination-pools-benchmarking",
@@ -9396,7 +9698,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime-common"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"bitvec",
"frame-benchmarking",
@@ -9442,7 +9744,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime-constants"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -9456,7 +9758,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime-metrics"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"bs58",
"parity-scale-codec",
@@ -9468,7 +9770,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime-parachains"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"bitflags",
"bitvec",
@@ -9481,6 +9783,7 @@ dependencies = [
"pallet-authorship",
"pallet-babe",
"pallet-balances",
+ "pallet-message-queue",
"pallet-session",
"pallet-staking",
"pallet-timestamp",
@@ -9512,7 +9815,7 @@ dependencies = [
[[package]]
name = "polkadot-service"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"async-trait",
"frame-benchmarking-cli",
@@ -9622,7 +9925,7 @@ dependencies = [
[[package]]
name = "polkadot-statement-distribution"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"arrayvec 0.5.2",
"fatality",
@@ -9643,7 +9946,7 @@ dependencies = [
[[package]]
name = "polkadot-statement-table"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"parity-scale-codec",
"polkadot-primitives",
@@ -9653,7 +9956,7 @@ dependencies = [
[[package]]
name = "polkadot-test-client"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"parity-scale-codec",
"polkadot-node-subsystem",
@@ -9678,7 +9981,7 @@ dependencies = [
[[package]]
name = "polkadot-test-runtime"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"bitvec",
"frame-election-provider-support",
@@ -9739,7 +10042,7 @@ dependencies = [
[[package]]
name = "polkadot-test-service"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"frame-benchmarking",
"frame-system",
@@ -9836,6 +10139,12 @@ dependencies = [
"universal-hash",
]
+[[package]]
+name = "portable-atomic"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26f6a7b87c2e435a3241addceeeff740ff8b7e76b74c13bf9acb17fa454ea00b"
+
[[package]]
name = "portpicker"
version = "0.1.1"
@@ -9893,6 +10202,16 @@ dependencies = [
"termtree",
]
+[[package]]
+name = "prettyplease"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.16",
+]
+
[[package]]
name = "primitive-types"
version = "0.12.0"
@@ -9959,20 +10278,20 @@ dependencies = [
[[package]]
name = "proc-macro-warning"
-version = "0.3.1"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e99670bafb56b9a106419397343bdbc8b8742c3cc449fec6345f86173f47cd4"
+checksum = "70550716265d1ec349c41f70dd4f964b4fd88394efe4405f0c1da679c4799a07"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
dependencies = [
"unicode-ident",
]
@@ -9993,21 +10312,21 @@ dependencies = [
[[package]]
name = "prometheus-client"
-version = "0.18.1"
+version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83cd1b99916654a69008fd66b4f9397fbe08e6e51dfe23d4417acf5d3b8cb87c"
+checksum = "5d6fa99d535dd930d1249e6c79cb3c2915f9172a540fe2b02a4c8f9ca954721e"
dependencies = [
"dtoa",
"itoa 1.0.4",
"parking_lot 0.12.1",
- "prometheus-client-derive-text-encode",
+ "prometheus-client-derive-encode",
]
[[package]]
-name = "prometheus-client-derive-text-encode"
-version = "0.3.0"
+name = "prometheus-client-derive-encode"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd"
+checksum = "72b6a5217beb0ad503ee7fa752d451c905113d70721b937126158f3106a48cc1"
dependencies = [
"proc-macro2",
"quote",
@@ -10044,19 +10363,6 @@ dependencies = [
"which",
]
-[[package]]
-name = "prost-codec"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dc34979ff898b6e141106178981ce2596c387ea6e62533facfc61a37fc879c0"
-dependencies = [
- "asynchronous-codec",
- "bytes",
- "prost",
- "thiserror",
- "unsigned-varint",
-]
-
[[package]]
name = "prost-derive"
version = "0.11.0"
@@ -10101,6 +10407,28 @@ version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
+[[package]]
+name = "quick-protobuf"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d6da84cc204722a989e01ba2f6e1e276e190f22263d0cb6ce8526fcdb0d2e1f"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "quick-protobuf-codec"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1693116345026436eb2f10b677806169c1a1260c1c60eaaffe3fb5a29ae23d8b"
+dependencies = [
+ "asynchronous-codec",
+ "bytes",
+ "quick-protobuf",
+ "thiserror",
+ "unsigned-varint",
+]
+
[[package]]
name = "quicksink"
version = "0.1.2"
@@ -10132,9 +10460,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.26"
+version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
dependencies = [
"proc-macro2",
]
@@ -10341,9 +10669,9 @@ dependencies = [
[[package]]
name = "regalloc2"
-version = "0.5.1"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c"
+checksum = "80535183cae11b149d618fbd3c37e38d7cda589d82d7769e196ca9a9042d7621"
dependencies = [
"fxhash",
"log",
@@ -10373,21 +10701,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.6.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
-
-[[package]]
-name = "region"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e"
-dependencies = [
- "bitflags",
- "libc",
- "mach",
- "winapi",
-]
+version = "0.6.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
[[package]]
name = "resolv-conf"
@@ -10447,9 +10763,9 @@ dependencies = [
[[package]]
name = "rocksdb"
-version = "0.20.1"
+version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "015439787fce1e75d55f279078d33ff14b4af5d93d995e8838ee4631301c8a99"
+checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe"
dependencies = [
"libc",
"librocksdb-sys",
@@ -10506,7 +10822,7 @@ dependencies = [
[[package]]
name = "rococo-runtime"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"binary-merkle-tree",
"frame-benchmarking",
@@ -10534,6 +10850,7 @@ dependencies = [
"pallet-im-online",
"pallet-indices",
"pallet-membership",
+ "pallet-message-queue",
"pallet-mmr",
"pallet-multisig",
"pallet-nis",
@@ -10592,7 +10909,7 @@ dependencies = [
[[package]]
name = "rococo-runtime-constants"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -10746,7 +11063,7 @@ version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
dependencies = [
- "base64",
+ "base64 0.13.0",
"log",
"ring",
"sct 0.6.1",
@@ -10783,7 +11100,7 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9"
dependencies = [
- "base64",
+ "base64 0.13.0",
]
[[package]]
@@ -10839,7 +11156,7 @@ dependencies = [
[[package]]
name = "sc-allocator"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"log",
"sp-core",
@@ -10850,7 +11167,7 @@ dependencies = [
[[package]]
name = "sc-authority-discovery"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"async-trait",
"futures",
@@ -10858,6 +11175,7 @@ dependencies = [
"ip_network",
"libp2p",
"log",
+ "multihash 0.17.0",
"parity-scale-codec",
"prost",
"prost-build",
@@ -10878,7 +11196,7 @@ dependencies = [
[[package]]
name = "sc-basic-authorship"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"futures",
"futures-timer",
@@ -10901,7 +11219,7 @@ dependencies = [
[[package]]
name = "sc-block-builder"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"parity-scale-codec",
"sc-client-api",
@@ -10916,7 +11234,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"memmap2",
"sc-chain-spec-derive",
@@ -10935,25 +11253,25 @@ dependencies = [
[[package]]
name = "sc-chain-spec-derive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
name = "sc-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"array-bytes 4.2.0",
"chrono",
- "clap 4.2.7",
+ "clap",
"fdlimit",
"futures",
- "libp2p",
+ "libp2p-identity",
"log",
"names",
"parity-scale-codec",
@@ -10986,7 +11304,7 @@ dependencies = [
[[package]]
name = "sc-client-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"fnv",
"futures",
@@ -11005,6 +11323,7 @@ dependencies = [
"sp-keystore",
"sp-runtime",
"sp-state-machine",
+ "sp-statement-store",
"sp-storage",
"substrate-prometheus-endpoint",
]
@@ -11012,7 +11331,7 @@ dependencies = [
[[package]]
name = "sc-client-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"hash-db",
"kvdb",
@@ -11038,12 +11357,12 @@ dependencies = [
[[package]]
name = "sc-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"async-trait",
"futures",
"futures-timer",
- "libp2p",
+ "libp2p-identity",
"log",
"mockall",
"parking_lot 0.12.1",
@@ -11063,7 +11382,7 @@ dependencies = [
[[package]]
name = "sc-consensus-aura"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"async-trait",
"futures",
@@ -11092,7 +11411,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"async-trait",
"fork-tree",
@@ -11128,7 +11447,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"futures",
"jsonrpsee",
@@ -11150,9 +11469,10 @@ dependencies = [
[[package]]
name = "sc-consensus-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"array-bytes 4.2.0",
+ "async-channel",
"async-trait",
"fnv",
"futures",
@@ -11185,7 +11505,7 @@ dependencies = [
[[package]]
name = "sc-consensus-beefy-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"futures",
"jsonrpsee",
@@ -11204,7 +11524,7 @@ dependencies = [
[[package]]
name = "sc-consensus-epochs"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"fork-tree",
"parity-scale-codec",
@@ -11217,7 +11537,7 @@ dependencies = [
[[package]]
name = "sc-consensus-grandpa"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"ahash 0.8.2",
"array-bytes 4.2.0",
@@ -11257,7 +11577,7 @@ dependencies = [
[[package]]
name = "sc-consensus-grandpa-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"finality-grandpa",
"futures",
@@ -11277,7 +11597,7 @@ dependencies = [
[[package]]
name = "sc-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"async-trait",
"futures",
@@ -11300,13 +11620,12 @@ dependencies = [
[[package]]
name = "sc-executor"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
- "lru 0.8.1",
+ "lru 0.10.0",
"parity-scale-codec",
"parking_lot 0.12.1",
"sc-executor-common",
- "sc-executor-wasmi",
"sc-executor-wasmtime",
"sp-api",
"sp-core",
@@ -11318,39 +11637,24 @@ dependencies = [
"sp-version",
"sp-wasm-interface",
"tracing",
- "wasmi 0.13.2",
]
[[package]]
name = "sc-executor-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"sc-allocator",
"sp-maybe-compressed-blob",
"sp-wasm-interface",
"thiserror",
"wasm-instrument 0.3.0",
- "wasmi 0.13.2",
-]
-
-[[package]]
-name = "sc-executor-wasmi"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
-dependencies = [
- "log",
- "sc-allocator",
- "sc-executor-common",
- "sp-runtime-interface",
- "sp-wasm-interface",
- "wasmi 0.13.2",
]
[[package]]
name = "sc-executor-wasmtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"anyhow",
"cfg-if",
@@ -11368,7 +11672,7 @@ dependencies = [
[[package]]
name = "sc-informant"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"ansi_term",
"futures",
@@ -11384,10 +11688,9 @@ dependencies = [
[[package]]
name = "sc-keystore"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"array-bytes 4.2.0",
- "async-trait",
"parking_lot 0.12.1",
"serde_json",
"sp-application-crypto",
@@ -11399,7 +11702,7 @@ dependencies = [
[[package]]
name = "sc-network"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"array-bytes 4.2.0",
"async-channel",
@@ -11414,7 +11717,7 @@ dependencies = [
"libp2p",
"linked_hash_set",
"log",
- "lru 0.8.1",
+ "lru 0.10.0",
"mockall",
"parity-scale-codec",
"parking_lot 0.12.1",
@@ -11444,11 +11747,12 @@ dependencies = [
[[package]]
name = "sc-network-bitswap"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
+ "async-channel",
"cid",
"futures",
- "libp2p",
+ "libp2p-identity",
"log",
"prost",
"prost-build",
@@ -11464,7 +11768,7 @@ dependencies = [
[[package]]
name = "sc-network-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"array-bytes 4.2.0",
"async-trait",
@@ -11472,7 +11776,7 @@ dependencies = [
"bytes",
"futures",
"futures-timer",
- "libp2p",
+ "libp2p-identity",
"parity-scale-codec",
"prost-build",
"sc-consensus",
@@ -11492,14 +11796,14 @@ dependencies = [
[[package]]
name = "sc-network-gossip"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"ahash 0.8.2",
"futures",
"futures-timer",
"libp2p",
"log",
- "lru 0.8.1",
+ "lru 0.10.0",
"sc-network",
"sc-network-common",
"sc-peerset",
@@ -11511,11 +11815,12 @@ dependencies = [
[[package]]
name = "sc-network-light"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"array-bytes 4.2.0",
+ "async-channel",
"futures",
- "libp2p",
+ "libp2p-identity",
"log",
"parity-scale-codec",
"prost",
@@ -11533,16 +11838,17 @@ dependencies = [
[[package]]
name = "sc-network-sync"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"array-bytes 4.2.0",
+ "async-channel",
"async-trait",
"fork-tree",
"futures",
"futures-timer",
"libp2p",
"log",
- "lru 0.8.1",
+ "lru 0.10.0",
"mockall",
"parity-scale-codec",
"prost",
@@ -11567,14 +11873,13 @@ dependencies = [
[[package]]
name = "sc-network-transactions"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"array-bytes 4.2.0",
"futures",
"libp2p",
"log",
"parity-scale-codec",
- "pin-project",
"sc-network",
"sc-network-common",
"sc-peerset",
@@ -11587,7 +11892,7 @@ dependencies = [
[[package]]
name = "sc-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"array-bytes 4.2.0",
"bytes",
@@ -11618,20 +11923,23 @@ dependencies = [
[[package]]
name = "sc-peerset"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"futures",
- "libp2p",
+ "libp2p-identity",
"log",
+ "parking_lot 0.12.1",
+ "partial_sort",
"sc-utils",
"serde_json",
+ "sp-arithmetic",
"wasm-timer",
]
[[package]]
name = "sc-proposer-metrics"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"log",
"substrate-prometheus-endpoint",
@@ -11640,7 +11948,7 @@ dependencies = [
[[package]]
name = "sc-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"futures",
"jsonrpsee",
@@ -11663,6 +11971,7 @@ dependencies = [
"sp-rpc",
"sp-runtime",
"sp-session",
+ "sp-statement-store",
"sp-version",
"tokio",
]
@@ -11670,7 +11979,7 @@ dependencies = [
[[package]]
name = "sc-rpc-api"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
@@ -11689,7 +11998,7 @@ dependencies = [
[[package]]
name = "sc-rpc-server"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"http",
"jsonrpsee",
@@ -11704,7 +12013,7 @@ dependencies = [
[[package]]
name = "sc-rpc-spec-v2"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"array-bytes 4.2.0",
"futures",
@@ -11730,7 +12039,7 @@ dependencies = [
[[package]]
name = "sc-service"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"async-trait",
"directories",
@@ -11796,7 +12105,7 @@ dependencies = [
[[package]]
name = "sc-state-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"log",
"parity-scale-codec",
@@ -11807,9 +12116,9 @@ dependencies = [
[[package]]
name = "sc-storage-monitor"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
- "clap 4.2.7",
+ "clap",
"fs4",
"futures",
"log",
@@ -11823,7 +12132,7 @@ dependencies = [
[[package]]
name = "sc-sync-state-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
@@ -11842,7 +12151,7 @@ dependencies = [
[[package]]
name = "sc-sysinfo"
version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"futures",
"libc",
@@ -11861,7 +12170,7 @@ dependencies = [
[[package]]
name = "sc-telemetry"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"chrono",
"futures",
@@ -11880,7 +12189,7 @@ dependencies = [
[[package]]
name = "sc-tracing"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"ansi_term",
"atty",
@@ -11911,18 +12220,18 @@ dependencies = [
[[package]]
name = "sc-tracing-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
name = "sc-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"async-trait",
"futures",
@@ -11949,7 +12258,7 @@ dependencies = [
[[package]]
name = "sc-transaction-pool-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"async-trait",
"futures",
@@ -11963,7 +12272,7 @@ dependencies = [
[[package]]
name = "sc-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"async-channel",
"futures",
@@ -11977,9 +12286,9 @@ dependencies = [
[[package]]
name = "scale-info"
-version = "2.6.0"
+version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfdef77228a4c05dc94211441595746732131ad7f6530c6c18f045da7b7ab937"
+checksum = "b569c32c806ec3abdf3b5869fb8bf1e0d275a7c1c9b0b05603d9464632649edf"
dependencies = [
"bitvec",
"cfg-if",
@@ -12226,9 +12535,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]]
name = "serde"
-version = "1.0.160"
+version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
+checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
dependencies = [
"serde_derive",
]
@@ -12244,13 +12553,13 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.160"
+version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
+checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
@@ -12266,9 +12575,9 @@ dependencies = [
[[package]]
name = "serde_spanned"
-version = "0.6.1"
+version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
+checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
dependencies = [
"serde",
]
@@ -12453,7 +12762,7 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec"
[[package]]
name = "slot-range-helper"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"enumn",
"parity-scale-codec",
@@ -12686,7 +12995,7 @@ version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2"
dependencies = [
- "base64",
+ "base64 0.13.0",
"bytes",
"flate2",
"futures",
@@ -12700,7 +13009,7 @@ dependencies = [
[[package]]
name = "sp-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"hash-db",
"log",
@@ -12720,7 +13029,7 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"Inflector",
"blake2",
@@ -12728,13 +13037,13 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
name = "sp-application-crypto"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -12746,8 +13055,8 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"integer-sqrt",
"num-traits",
@@ -12761,7 +13070,7 @@ dependencies = [
[[package]]
name = "sp-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -12774,7 +13083,7 @@ dependencies = [
[[package]]
name = "sp-block-builder"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -12786,11 +13095,11 @@ dependencies = [
[[package]]
name = "sp-blockchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"futures",
"log",
- "lru 0.8.1",
+ "lru 0.10.0",
"parity-scale-codec",
"parking_lot 0.12.1",
"sp-api",
@@ -12804,7 +13113,7 @@ dependencies = [
[[package]]
name = "sp-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"async-trait",
"futures",
@@ -12819,7 +13128,7 @@ dependencies = [
[[package]]
name = "sp-consensus-aura"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -12837,7 +13146,7 @@ dependencies = [
[[package]]
name = "sp-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -12858,7 +13167,7 @@ dependencies = [
[[package]]
name = "sp-consensus-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"lazy_static",
"parity-scale-codec",
@@ -12877,7 +13186,7 @@ dependencies = [
[[package]]
name = "sp-consensus-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"finality-grandpa",
"log",
@@ -12895,7 +13204,7 @@ dependencies = [
[[package]]
name = "sp-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -12906,8 +13215,8 @@ dependencies = [
[[package]]
name = "sp-core"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"array-bytes 4.2.0",
"bitflags",
@@ -12950,8 +13259,8 @@ dependencies = [
[[package]]
name = "sp-core-hashing"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "6.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"blake2b_simd",
"byteorder",
@@ -12964,19 +13273,19 @@ dependencies = [
[[package]]
name = "sp-core-hashing-proc-macro"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "6.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"proc-macro2",
"quote",
"sp-core-hashing",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
name = "sp-database"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"kvdb",
"parking_lot 0.12.1",
@@ -12984,18 +13293,18 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "6.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
name = "sp-externalities"
-version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "0.14.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -13006,7 +13315,7 @@ dependencies = [
[[package]]
name = "sp-inherents"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"async-trait",
"impl-trait-for-tuples",
@@ -13020,8 +13329,8 @@ dependencies = [
[[package]]
name = "sp-io"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"bytes",
"ed25519",
@@ -13046,8 +13355,8 @@ dependencies = [
[[package]]
name = "sp-keyring"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"lazy_static",
"sp-core",
@@ -13057,8 +13366,8 @@ dependencies = [
[[package]]
name = "sp-keystore"
-version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "0.14.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"futures",
"parity-scale-codec",
@@ -13072,7 +13381,7 @@ dependencies = [
[[package]]
name = "sp-maybe-compressed-blob"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"thiserror",
"zstd 0.12.3+zstd.1.5.2",
@@ -13081,7 +13390,7 @@ dependencies = [
[[package]]
name = "sp-metadata-ir"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-metadata",
"parity-scale-codec",
@@ -13092,7 +13401,7 @@ dependencies = [
[[package]]
name = "sp-mmr-primitives"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"ckb-merkle-mountain-range",
"log",
@@ -13110,7 +13419,7 @@ dependencies = [
[[package]]
name = "sp-npos-elections"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -13124,7 +13433,7 @@ dependencies = [
[[package]]
name = "sp-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"sp-api",
"sp-core",
@@ -13133,8 +13442,8 @@ dependencies = [
[[package]]
name = "sp-panic-handler"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "6.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"backtrace",
"lazy_static",
@@ -13144,7 +13453,7 @@ dependencies = [
[[package]]
name = "sp-rpc"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"rustc-hash",
"serde",
@@ -13153,8 +13462,8 @@ dependencies = [
[[package]]
name = "sp-runtime"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"either",
"hash256-std-hasher",
@@ -13175,8 +13484,8 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"bytes",
"impl-trait-for-tuples",
@@ -13193,29 +13502,20 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"Inflector",
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.15",
-]
-
-[[package]]
-name = "sp-serializer"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
-dependencies = [
- "serde",
- "serde_json",
+ "syn 2.0.16",
]
[[package]]
name = "sp-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -13229,7 +13529,7 @@ dependencies = [
[[package]]
name = "sp-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -13241,8 +13541,8 @@ dependencies = [
[[package]]
name = "sp-state-machine"
-version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "0.14.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"hash-db",
"log",
@@ -13259,15 +13559,33 @@ dependencies = [
"tracing",
]
+[[package]]
+name = "sp-statement-store"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
+dependencies = [
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-core",
+ "sp-externalities",
+ "sp-runtime",
+ "sp-runtime-interface",
+ "sp-std",
+ "thiserror",
+]
+
[[package]]
name = "sp-std"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "6.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
[[package]]
name = "sp-storage"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -13280,7 +13598,7 @@ dependencies = [
[[package]]
name = "sp-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"async-trait",
"futures-timer",
@@ -13294,8 +13612,8 @@ dependencies = [
[[package]]
name = "sp-tracing"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"parity-scale-codec",
"sp-std",
@@ -13307,7 +13625,7 @@ dependencies = [
[[package]]
name = "sp-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"sp-api",
"sp-runtime",
@@ -13316,7 +13634,7 @@ dependencies = [
[[package]]
name = "sp-transaction-storage-proof"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"async-trait",
"log",
@@ -13331,8 +13649,8 @@ dependencies = [
[[package]]
name = "sp-trie"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"ahash 0.8.2",
"hash-db",
@@ -13354,8 +13672,8 @@ dependencies = [
[[package]]
name = "sp-version"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "6.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -13371,33 +13689,32 @@ dependencies = [
[[package]]
name = "sp-version-proc-macro"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "4.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"parity-scale-codec",
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
name = "sp-wasm-interface"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"anyhow",
"impl-trait-for-tuples",
"log",
"parity-scale-codec",
"sp-std",
- "wasmi 0.13.2",
"wasmtime",
]
[[package]]
name = "sp-weights"
-version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -13421,6 +13738,17 @@ version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09"
+[[package]]
+name = "spinners"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08615eea740067d9899969bc2891c68a19c315cb1f66640af9a9ecb91b13bcab"
+dependencies = [
+ "lazy_static",
+ "maplit",
+ "strum",
+]
+
[[package]]
name = "spki"
version = "0.6.0"
@@ -13484,6 +13812,32 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+[[package]]
+name = "statemine-it"
+version = "1.0.0"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "integration-tests-common",
+ "pallet-assets",
+ "pallet-balances",
+ "pallet-xcm",
+ "parachains-common",
+ "parity-scale-codec",
+ "penpal-runtime",
+ "polkadot-core-primitives",
+ "polkadot-parachain",
+ "polkadot-runtime",
+ "polkadot-runtime-parachains",
+ "sp-core",
+ "sp-runtime",
+ "sp-weights",
+ "statemine-runtime",
+ "xcm",
+ "xcm-emulator",
+ "xcm-executor",
+]
+
[[package]]
name = "statemine-runtime"
version = "2.0.0"
@@ -13556,6 +13910,32 @@ dependencies = [
"xcm-executor",
]
+[[package]]
+name = "statemint-it"
+version = "1.0.0"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "integration-tests-common",
+ "pallet-assets",
+ "pallet-balances",
+ "pallet-xcm",
+ "parachains-common",
+ "parity-scale-codec",
+ "penpal-runtime",
+ "polkadot-core-primitives",
+ "polkadot-parachain",
+ "polkadot-runtime",
+ "polkadot-runtime-parachains",
+ "sp-core",
+ "sp-runtime",
+ "sp-weights",
+ "statemint-runtime",
+ "xcm",
+ "xcm-emulator",
+ "xcm-executor",
+]
+
[[package]]
name = "statemint-runtime"
version = "1.0.0"
@@ -13587,6 +13967,8 @@ dependencies = [
"pallet-balances",
"pallet-collator-selection",
"pallet-multisig",
+ "pallet-nfts",
+ "pallet-nfts-runtime-api",
"pallet-proxy",
"pallet-session",
"pallet-timestamp",
@@ -13716,7 +14098,7 @@ version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7e94b1ec00bad60e6410e058b52f1c66de3dc5fe4d62d09b3e52bb7d3b73e25"
dependencies = [
- "base64",
+ "base64 0.13.0",
"crc",
"lazy_static",
"md-5",
@@ -13745,15 +14127,15 @@ dependencies = [
[[package]]
name = "substrate-build-script-utils"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
- "platforms 2.0.0",
+ "platforms",
]
[[package]]
name = "substrate-frame-rpc-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"frame-system-rpc-runtime-api",
"futures",
@@ -13772,7 +14154,7 @@ dependencies = [
[[package]]
name = "substrate-prometheus-endpoint"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"hyper",
"log",
@@ -13784,7 +14166,7 @@ dependencies = [
[[package]]
name = "substrate-rpc-client"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"async-trait",
"jsonrpsee",
@@ -13797,7 +14179,7 @@ dependencies = [
[[package]]
name = "substrate-state-trie-migration-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"jsonrpsee",
"log",
@@ -13816,7 +14198,7 @@ dependencies = [
[[package]]
name = "substrate-test-client"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"array-bytes 4.2.0",
"async-trait",
@@ -13842,7 +14224,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"futures",
"substrate-test-utils-derive",
@@ -13852,27 +14234,28 @@ dependencies = [
[[package]]
name = "substrate-test-utils-derive"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
name = "substrate-wasm-builder"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"ansi_term",
"build-helper",
"cargo_metadata",
"filetime",
+ "parity-wasm",
"sp-maybe-compressed-blob",
"strum",
"tempfile",
- "toml 0.7.3",
+ "toml 0.7.4",
"walkdir",
"wasm-opt",
]
@@ -13905,9 +14288,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.15"
+version = "2.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"
dependencies = [
"proc-macro2",
"quote",
@@ -13990,7 +14373,7 @@ checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16"
[[package]]
name = "test-runtime-constants"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -14001,12 +14384,6 @@ dependencies = [
"sp-weights",
]
-[[package]]
-name = "textwrap"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
-
[[package]]
name = "thiserror"
version = "1.0.40"
@@ -14024,7 +14401,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
@@ -14179,9 +14556,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
-version = "1.28.0"
+version = "1.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f"
+checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105"
dependencies = [
"autocfg",
"bytes",
@@ -14204,7 +14581,18 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
+]
+
+[[package]]
+name = "tokio-retry"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f"
+dependencies = [
+ "pin-project",
+ "rand 0.8.5",
+ "tokio",
]
[[package]]
@@ -14256,9 +14644,9 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.7.3"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
+checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec"
dependencies = [
"serde",
"serde_spanned",
@@ -14268,18 +14656,18 @@ dependencies = [
[[package]]
name = "toml_datetime"
-version = "0.6.1"
+version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
-version = "0.19.7"
+version = "0.19.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274"
+checksum = "92d964908cec0d030b812013af25a0e57fddfadb1e066ecc6681d86253129d4f"
dependencies = [
"indexmap",
"serde",
@@ -14301,9 +14689,9 @@ dependencies = [
[[package]]
name = "tower-http"
-version = "0.3.5"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858"
+checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658"
dependencies = [
"bitflags",
"bytes",
@@ -14376,7 +14764,7 @@ dependencies = [
[[package]]
name = "tracing-gum"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"polkadot-node-jaeger",
"polkadot-primitives",
@@ -14387,13 +14775,13 @@ dependencies = [
[[package]]
name = "tracing-gum-proc-macro"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"expander 2.0.0",
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
@@ -14517,10 +14905,10 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
[[package]]
name = "try-runtime-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#44130d53f222a0efdd976e76e32460680637c5fe"
+source = "git+https://github.com/paritytech/substrate?branch=master#2bc071f33da268ae218f2f376e7aa1dbf397ec76"
dependencies = [
"async-trait",
- "clap 4.2.7",
+ "clap",
"frame-remote-externalities",
"frame-try-runtime",
"hex",
@@ -14564,7 +14952,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4712ee30d123ec7ae26d1e1b218395a16c87cdbaf4b3925d170d684af62ea5e8"
dependencies = [
"async-trait",
- "base64",
+ "base64 0.13.0",
"futures",
"log",
"md-5",
@@ -14788,9 +15176,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.78"
+version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
+checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@@ -14798,13 +15186,13 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.78"
+version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
+checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
dependencies = [
"bumpalo",
- "lazy_static",
"log",
+ "once_cell",
"proc-macro2",
"quote",
"syn 1.0.109",
@@ -14813,9 +15201,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.28"
+version = "0.4.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39"
+checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
dependencies = [
"cfg-if",
"js-sys",
@@ -14825,9 +15213,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.78"
+version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
+checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -14835,9 +15223,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.78"
+version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
+checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
dependencies = [
"proc-macro2",
"quote",
@@ -14848,9 +15236,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.78"
+version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
+checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
[[package]]
name = "wasm-instrument"
@@ -14872,9 +15260,9 @@ dependencies = [
[[package]]
name = "wasm-opt"
-version = "0.111.0"
+version = "0.112.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a303793cbc01fb96551badfc7367db6007396bba6bac97936b3c8b6f7fdb41"
+checksum = "87fef6d0d508f08334e0ab0e6877feb4c0ecb3956bcf2cb950699b22fedf3e9c"
dependencies = [
"anyhow",
"libc",
@@ -14888,9 +15276,9 @@ dependencies = [
[[package]]
name = "wasm-opt-cxx-sys"
-version = "0.111.0"
+version = "0.112.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c9deb56f8a9f2ec177b3bd642a8205621835944ed5da55f2388ef216aca5a4"
+checksum = "bc816bbc1596c8f2e8127e137a760c798023ef3d378f2ae51f0f1840e2dfa445"
dependencies = [
"anyhow",
"cxx",
@@ -14900,15 +15288,14 @@ dependencies = [
[[package]]
name = "wasm-opt-sys"
-version = "0.111.0"
+version = "0.112.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4432e28b542738a9776cedf92e8a99d8991c7b4667ee2c7ccddfb479dd2856a7"
+checksum = "40199e4f68ef1071b3c6d0bd8026a12b481865d4b9e49c156932ea9a6234dd14"
dependencies = [
"anyhow",
"cc",
"cxx",
"cxx-build",
- "regex",
]
[[package]]
@@ -14926,17 +15313,6 @@ dependencies = [
"web-sys",
]
-[[package]]
-name = "wasmi"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422"
-dependencies = [
- "parity-wasm",
- "wasmi-validation",
- "wasmi_core 0.2.1",
-]
-
[[package]]
name = "wasmi"
version = "0.28.0"
@@ -14945,39 +15321,16 @@ checksum = "8e61a7006b0fdf24f6bbe8dcfdad5ca1b350de80061fb2827f31c82fbbb9565a"
dependencies = [
"spin 0.9.4",
"wasmi_arena",
- "wasmi_core 0.12.0",
+ "wasmi_core",
"wasmparser-nostd",
]
-[[package]]
-name = "wasmi-validation"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b"
-dependencies = [
- "parity-wasm",
-]
-
[[package]]
name = "wasmi_arena"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "401c1f35e413fac1846d4843745589d9ec678977ab35a384db8ae7830525d468"
-[[package]]
-name = "wasmi_core"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7"
-dependencies = [
- "downcast-rs",
- "libm 0.2.1",
- "memory_units",
- "num-rational",
- "num-traits",
- "region",
-]
-
[[package]]
name = "wasmi_core"
version = "0.12.0"
@@ -14992,9 +15345,9 @@ dependencies = [
[[package]]
name = "wasmparser"
-version = "0.100.0"
+version = "0.102.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4"
+checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b"
dependencies = [
"indexmap",
"url",
@@ -15011,9 +15364,9 @@ dependencies = [
[[package]]
name = "wasmtime"
-version = "6.0.2"
+version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76a222f5fa1e14b2cefc286f1b68494d7a965f4bf57ec04c59bb62673d639af6"
+checksum = "f907fdead3153cb9bfb7a93bbd5b62629472dc06dee83605358c64c52ed3dda9"
dependencies = [
"anyhow",
"bincode",
@@ -15021,7 +15374,7 @@ dependencies = [
"indexmap",
"libc",
"log",
- "object 0.29.0",
+ "object",
"once_cell",
"paste",
"psm",
@@ -15034,26 +15387,26 @@ dependencies = [
"wasmtime-environ",
"wasmtime-jit",
"wasmtime-runtime",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
]
[[package]]
name = "wasmtime-asm-macros"
-version = "6.0.2"
+version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4407a7246e7d2f3d8fb1cf0c72fda8dbafdb6dd34d555ae8bea0e5ae031089cc"
+checksum = "d3b9daa7c14cd4fa3edbf69de994408d5f4b7b0959ac13fa69d465f6597f810d"
dependencies = [
"cfg-if",
]
[[package]]
name = "wasmtime-cache"
-version = "6.0.2"
+version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ceb3adf61d654be0be67fffdce42447b0880481348785be5fe40b5dd7663a4c"
+checksum = "c86437fa68626fe896e5afc69234bb2b5894949083586535f200385adfd71213"
dependencies = [
"anyhow",
- "base64",
+ "base64 0.21.1",
"bincode",
"directories-next",
"file-per-thread-logger",
@@ -15062,15 +15415,15 @@ dependencies = [
"serde",
"sha2 0.10.2",
"toml 0.5.10",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
"zstd 0.11.2+zstd.1.5.2",
]
[[package]]
name = "wasmtime-cranelift"
-version = "6.0.2"
+version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c366bb8647e01fd08cb5589976284b00abfded5529b33d7e7f3f086c68304a4"
+checksum = "b1cefde0cce8cb700b1b21b6298a3837dba46521affd7b8c38a9ee2c869eee04"
dependencies = [
"anyhow",
"cranelift-codegen",
@@ -15078,27 +15431,43 @@ dependencies = [
"cranelift-frontend",
"cranelift-native",
"cranelift-wasm",
- "gimli 0.26.1",
+ "gimli",
"log",
- "object 0.29.0",
+ "object",
"target-lexicon",
"thiserror",
"wasmparser",
+ "wasmtime-cranelift-shared",
+ "wasmtime-environ",
+]
+
+[[package]]
+name = "wasmtime-cranelift-shared"
+version = "8.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd041e382ef5aea1b9fc78442394f1a4f6d676ce457e7076ca4cb3f397882f8b"
+dependencies = [
+ "anyhow",
+ "cranelift-codegen",
+ "cranelift-native",
+ "gimli",
+ "object",
+ "target-lexicon",
"wasmtime-environ",
]
[[package]]
name = "wasmtime-environ"
-version = "6.0.2"
+version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b8b50962eae38ee319f7b24900b7cf371f03eebdc17400c1dc8575fc10c9a7"
+checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949"
dependencies = [
"anyhow",
"cranelift-entity",
- "gimli 0.26.1",
+ "gimli",
"indexmap",
"log",
- "object 0.29.0",
+ "object",
"serde",
"target-lexicon",
"thiserror",
@@ -15108,18 +15477,18 @@ dependencies = [
[[package]]
name = "wasmtime-jit"
-version = "6.0.2"
+version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffaed4f9a234ba5225d8e64eac7b4a5d13b994aeb37353cde2cbeb3febda9eaa"
+checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244"
dependencies = [
- "addr2line 0.17.0",
+ "addr2line",
"anyhow",
"bincode",
"cfg-if",
"cpp_demangle",
- "gimli 0.26.1",
+ "gimli",
"log",
- "object 0.29.0",
+ "object",
"rustc-demangle",
"serde",
"target-lexicon",
@@ -15127,36 +15496,36 @@ dependencies = [
"wasmtime-jit-debug",
"wasmtime-jit-icache-coherence",
"wasmtime-runtime",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
]
[[package]]
name = "wasmtime-jit-debug"
-version = "6.0.2"
+version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eed41cbcbf74ce3ff6f1d07d1b707888166dc408d1a880f651268f4f7c9194b2"
+checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846"
dependencies = [
- "object 0.29.0",
+ "object",
"once_cell",
"rustix 0.36.7",
]
[[package]]
name = "wasmtime-jit-icache-coherence"
-version = "6.0.2"
+version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a28ae1e648461bfdbb79db3efdaee1bca5b940872e4175390f465593a2e54c"
+checksum = "aecae978b13f7f67efb23bd827373ace4578f2137ec110bbf6a4a7cde4121bbd"
dependencies = [
"cfg-if",
"libc",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
]
[[package]]
name = "wasmtime-runtime"
-version = "6.0.2"
+version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e704b126e4252788ccfc3526d4d4511d4b23c521bf123e447ac726c14545217b"
+checksum = "658cf6f325232b6760e202e5255d823da5e348fdea827eff0a2a22319000b441"
dependencies = [
"anyhow",
"cc",
@@ -15166,21 +15535,21 @@ dependencies = [
"log",
"mach",
"memfd",
- "memoffset 0.6.5",
+ "memoffset 0.8.0",
"paste",
"rand 0.8.5",
"rustix 0.36.7",
"wasmtime-asm-macros",
"wasmtime-environ",
"wasmtime-jit-debug",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
]
[[package]]
name = "wasmtime-types"
-version = "6.0.2"
+version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83e5572c5727c1ee7e8f28717aaa8400e4d22dcbd714ea5457d85b5005206568"
+checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f"
dependencies = [
"cranelift-entity",
"serde",
@@ -15451,7 +15820,7 @@ dependencies = [
[[package]]
name = "westend-runtime"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"bitvec",
"frame-benchmarking",
@@ -15480,6 +15849,7 @@ dependencies = [
"pallet-im-online",
"pallet-indices",
"pallet-membership",
+ "pallet-message-queue",
"pallet-multisig",
"pallet-nomination-pools",
"pallet-nomination-pools-benchmarking",
@@ -15543,7 +15913,7 @@ dependencies = [
[[package]]
name = "westend-runtime-constants"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -15586,6 +15956,7 @@ dependencies = [
"pallet-bridge-transfer",
"pallet-collator-selection",
"pallet-multisig",
+ "pallet-nft-fractionalization",
"pallet-nfts",
"pallet-nfts-runtime-api",
"pallet-proxy",
@@ -15959,9 +16330,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
[[package]]
name = "winnow"
-version = "0.3.6"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d020b441f92996c80d94ae9166e8501e59c7bb56121189dc9eab3bd8216966"
+checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
dependencies = [
"memchr",
]
@@ -16013,7 +16384,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c"
dependencies = [
"asn1-rs 0.3.1",
- "base64",
+ "base64 0.13.0",
"data-encoding",
"der-parser 7.0.0",
"lazy_static",
@@ -16032,7 +16403,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8"
dependencies = [
"asn1-rs 0.5.1",
- "base64",
+ "base64 0.13.0",
"data-encoding",
"der-parser 8.1.0",
"lazy_static",
@@ -16046,7 +16417,7 @@ dependencies = [
[[package]]
name = "xcm"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"bounded-collections",
"derivative",
@@ -16062,7 +16433,7 @@ dependencies = [
[[package]]
name = "xcm-builder"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"frame-support",
"frame-system",
@@ -16076,6 +16447,40 @@ dependencies = [
"sp-io",
"sp-runtime",
"sp-std",
+ "sp-weights",
+ "xcm",
+ "xcm-executor",
+]
+
+[[package]]
+name = "xcm-emulator"
+version = "0.1.0"
+dependencies = [
+ "casey",
+ "cumulus-pallet-dmp-queue",
+ "cumulus-pallet-parachain-system",
+ "cumulus-pallet-xcmp-queue",
+ "cumulus-primitives-core",
+ "cumulus-primitives-parachain-inherent",
+ "cumulus-test-relay-sproof-builder",
+ "cumulus-test-service",
+ "frame-support",
+ "frame-system",
+ "log",
+ "pallet-balances",
+ "pallet-message-queue",
+ "parachain-info",
+ "parachains-common",
+ "parity-scale-codec",
+ "paste",
+ "polkadot-primitives",
+ "polkadot-runtime-parachains",
+ "quote",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-io",
+ "sp-std",
+ "sp-trie",
"xcm",
"xcm-executor",
]
@@ -16083,7 +16488,7 @@ dependencies = [
[[package]]
name = "xcm-executor"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"environmental",
"frame-benchmarking",
@@ -16103,12 +16508,12 @@ dependencies = [
[[package]]
name = "xcm-procedural"
version = "0.9.41"
-source = "git+https://github.com/paritytech/polkadot?branch=master#81456c83ae4736f51ae0ad63f9d7e1fa321ba076"
+source = "git+https://github.com/paritytech/polkadot?branch=master#710419524ece26228f70562147f704eacd00e3af"
dependencies = [
"Inflector",
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
@@ -16136,9 +16541,9 @@ dependencies = [
[[package]]
name = "zeroize"
-version = "1.5.7"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"
+checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
dependencies = [
"zeroize_derive",
]
diff --git a/Cargo.toml b/Cargo.toml
index ae2966e05a6..26c916777ba 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,6 +10,7 @@ members = [
"client/cli",
"client/consensus/aura",
"client/consensus/common",
+ "client/consensus/proposer",
"client/consensus/relay-chain",
"client/network",
"client/pov-recovery",
@@ -50,12 +51,17 @@ members = [
"parachains/runtimes/bridge-hubs/bridge-hub-polkadot",
"parachains/runtimes/collectives/collectives-polkadot",
"parachains/runtimes/contracts/contracts-rococo",
+ "parachains/runtimes/glutton/glutton-kusama",
"parachains/runtimes/testing/penpal",
+ "parachains/integration-tests/emulated/common",
+ "parachains/integration-tests/emulated/assets/statemine",
+ "parachains/integration-tests/emulated/assets/statemint",
"test/client",
"test/relay-sproof-builder",
"test/relay-validation-worker-provider",
"test/runtime",
"test/service",
+ "xcm/xcm-emulator",
]
[profile.release]
diff --git a/README.md b/README.md
index d1828eafce1..fe6836e03ae 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ A set of tools for writing [Substrate](https://substrate.io/)-based
[Polkadot](https://wiki.polkadot.network/en/)
[parachains](https://wiki.polkadot.network/docs/en/learn-parachains). Refer to the included
[overview](docs/overview.md) for architectural details, and the
-[Connect to relay and parachain tutorials](https://docs.substrate.io/tutorials/connect-relay-and-parachains/) for a
+[Connect to a relay chain how-to guide](https://docs.substrate.io/reference/how-to-guides/parachains/connect-to-a-relay-chain/) for a
guided walk-through of using these tools.
It's easy to write blockchains using Substrate, and the overhead of writing parachains'
@@ -179,7 +179,7 @@ To run a Statemine or Westmint node (Statemint is not deployed, yet) you will ne
`polkadot-parachain` binary:
```bash
-cargo build --release --locked -p polkadot-parachain
+cargo build --release --locked --bin polkadot-parachain
```
Once the executable is built, launch the parachain node via:
@@ -189,7 +189,7 @@ CHAIN=westmint # or statemine
./target/release/polkadot-parachain --chain $CHAIN
```
-Refer to the [setup instructions](#local-setup) to run a local network for development.
+Refer to the [setup instructions](#manual-setup) to run a local network for development.
## Contracts 📝
@@ -219,7 +219,7 @@ eventually be included by the relay chain for a parachain.
To run a Rococo collator you will need to compile the following binary:
```bash
-cargo build --release --locked -p polkadot-parachain
+cargo build --release --locked --bin polkadot-parachain
```
Otherwise you can compile it with
@@ -228,7 +228,7 @@ Otherwise you can compile it with
```bash
docker run --rm -it -w /shellhere/cumulus \
-v $(pwd):/shellhere/cumulus \
- paritytech/ci-linux:production cargo build --release --locked -p polkadot-parachain
+ paritytech/ci-linux:production cargo build --release --locked --bin polkadot-parachain
sudo chown -R $(id -u):$(id -g) target/
```
diff --git a/bridges/README.md b/bridges/README.md
index aab6007d2cd..2f8c5ca9abb 100644
--- a/bridges/README.md
+++ b/bridges/README.md
@@ -242,7 +242,7 @@ To run a Rialto node for example, you can use the following command:
```bash
docker run -p 30333:30333 -p 9933:9933 -p 9944:9944 \
-it paritytech/rialto-bridge-node --dev --tmp \
- --rpc-cors=all --unsafe-rpc-external --unsafe-ws-external
+ --rpc-cors=all --unsafe-rpc-external
```
## Community
diff --git a/bridges/bin/runtime-common/Cargo.toml b/bridges/bin/runtime-common/Cargo.toml
index 039e323b9b7..5f42048d8d3 100644
--- a/bridges/bin/runtime-common/Cargo.toml
+++ b/bridges/bin/runtime-common/Cargo.toml
@@ -10,7 +10,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive"] }
hash-db = { version = "0.16.0", default-features = false }
log = { version = "0.4.17", default-features = false }
-scale-info = { version = "2.6.0", default-features = false, features = ["derive"] }
+scale-info = { version = "2.7.0", default-features = false, features = ["derive"] }
static_assertions = { version = "1.1", optional = true }
# Bridge dependencies
@@ -40,10 +40,8 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", d
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
# Polkadot dependencies
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false }
xcm = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false }
xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false }
[dev-dependencies]
bp-test-utils = { path = "../../primitives/test-utils" }
@@ -68,7 +66,6 @@ std = [
"pallet-bridge-relayers/std",
"pallet-transaction-payment/std",
"pallet-utility/std",
- "pallet-xcm/std",
"scale-info/std",
"sp-api/std",
"sp-core/std",
@@ -78,13 +75,12 @@ std = [
"sp-trie/std",
"xcm/std",
"xcm-builder/std",
- "xcm-executor/std",
]
runtime-benchmarks = [
"pallet-bridge-grandpa/runtime-benchmarks",
"pallet-bridge-messages/runtime-benchmarks",
"pallet-bridge-parachains/runtime-benchmarks",
- "pallet-xcm/runtime-benchmarks",
+ "pallet-bridge-relayers/runtime-benchmarks",
"xcm-builder/runtime-benchmarks",
]
integrity-test = [
diff --git a/bridges/bin/runtime-common/src/lib.rs b/bridges/bin/runtime-common/src/lib.rs
index 12b096492cd..546d4388471 100644
--- a/bridges/bin/runtime-common/src/lib.rs
+++ b/bridges/bin/runtime-common/src/lib.rs
@@ -28,12 +28,12 @@ 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 messages_generation;
mod mock;
#[cfg(feature = "integrity-test")]
diff --git a/bridges/bin/runtime-common/src/messages.rs b/bridges/bin/runtime-common/src/messages.rs
index 6f6b1959577..e6c7deb98a2 100644
--- a/bridges/bin/runtime-common/src/messages.rs
+++ b/bridges/bin/runtime-common/src/messages.rs
@@ -22,18 +22,19 @@
pub use bp_runtime::{RangeInclusiveExt, UnderlyingChainOf, UnderlyingChainProvider};
-use bp_header_chain::{HeaderChain, HeaderChainError};
+use bp_header_chain::HeaderChain;
use bp_messages::{
source_chain::{LaneMessageVerifier, TargetHeaderChain},
target_chain::{ProvedLaneMessages, ProvedMessages, SourceHeaderChain},
InboundLaneData, LaneId, Message, MessageKey, MessageNonce, MessagePayload, OutboundLaneData,
+ VerificationError,
};
-use bp_runtime::{Chain, RawStorageProof, Size, StorageProofChecker, StorageProofError};
+use bp_runtime::{Chain, RawStorageProof, Size, StorageProofChecker};
use codec::{Decode, Encode};
use frame_support::{traits::Get, weights::Weight, RuntimeDebug};
use hash_db::Hasher;
use scale_info::TypeInfo;
-use sp_std::{convert::TryFrom, fmt::Debug, marker::PhantomData, vec::Vec};
+use sp_std::{convert::TryFrom, marker::PhantomData, vec::Vec};
/// Bidirectional message bridge.
pub trait MessageBridge {
@@ -74,29 +75,6 @@ pub type BalanceOf = bp_runtime::BalanceOf>;
/// Type of origin that is used on the chain.
pub type OriginOf = ::RuntimeOrigin;
-/// Error that happens during message verification.
-#[derive(Debug, PartialEq, Eq)]
-pub enum Error {
- /// The message proof is empty.
- EmptyMessageProof,
- /// Error returned by the bridged header chain.
- HeaderChain(HeaderChainError),
- /// Error returned while reading/decoding inbound lane data from the storage proof.
- InboundLaneStorage(StorageProofError),
- /// The declared message weight is incorrect.
- InvalidMessageWeight,
- /// Declared messages count doesn't match actual value.
- MessagesCountMismatch,
- /// Error returned while reading/decoding message data from the storage proof.
- MessageStorage(StorageProofError),
- /// The message is too large.
- MessageTooLarge,
- /// Error returned while reading/decoding outbound lane data from the storage proof.
- OutboundLaneStorage(StorageProofError),
- /// Storage proof related error.
- StorageProof(StorageProofError),
-}
-
/// Sub-module that is declaring types required for processing This -> Bridged chain messages.
pub mod source {
use super::*;
@@ -169,14 +147,12 @@ pub mod source {
+ Into>>, OriginOf>>>,
AccountIdOf>: PartialEq + Clone,
{
- type Error = &'static str;
-
fn verify_message(
_submitter: &OriginOf>,
_lane: &LaneId,
_lane_outbound_data: &OutboundLaneData,
_payload: &FromThisChainMessagePayload,
- ) -> Result<(), Self::Error> {
+ ) -> 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
@@ -200,16 +176,15 @@ pub mod source {
impl TargetHeaderChain>>
for TargetHeaderChainAdapter
{
- type Error = Error;
type MessagesDeliveryProof = FromBridgedChainMessagesDeliveryProof>>;
- fn verify_message(payload: &FromThisChainMessagePayload) -> Result<(), Self::Error> {
+ fn verify_message(payload: &FromThisChainMessagePayload) -> Result<(), VerificationError> {
verify_chain_message::(payload)
}
fn verify_messages_delivery_proof(
proof: Self::MessagesDeliveryProof,
- ) -> Result<(LaneId, InboundLaneData>>), Self::Error> {
+ ) -> Result<(LaneId, InboundLaneData>>), VerificationError> {
verify_messages_delivery_proof::(proof)
}
}
@@ -221,7 +196,7 @@ pub mod source {
/// check) that would reject message (see `FromThisChainMessageVerifier`).
pub fn verify_chain_message(
payload: &FromThisChainMessagePayload,
- ) -> Result<(), Error> {
+ ) -> 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
@@ -241,9 +216,9 @@ pub mod source {
// 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 weight for this data.
+ // 1/3 of the the maximal extrinsic size for this data.
if payload.len() > maximal_message_size::() as usize {
- return Err(Error::MessageTooLarge)
+ return Err(VerificationError::MessageTooLarge)
}
Ok(())
@@ -255,31 +230,26 @@ pub mod source {
/// parachains, please use the `verify_messages_delivery_proof_from_parachain`.
pub fn verify_messages_delivery_proof(
proof: FromBridgedChainMessagesDeliveryProof>>,
- ) -> Result, Error> {
+ ) -> Result, VerificationError> {
let FromBridgedChainMessagesDeliveryProof { bridged_header_hash, storage_proof, lane } =
proof;
- B::BridgedHeaderChain::parse_finalized_storage_proof(
- bridged_header_hash,
- storage_proof,
- |mut storage| {
- // 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(Error::InboundLaneStorage)?;
-
- // check that the storage proof doesn't have any untouched trie nodes
- storage.ensure_no_unused_nodes().map_err(Error::StorageProof)?;
-
- Ok((lane, inbound_lane_data))
- },
- )
- .map_err(Error::HeaderChain)?
+ 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))
}
}
@@ -335,13 +305,12 @@ pub mod target {
pub struct SourceHeaderChainAdapter(PhantomData);
impl SourceHeaderChain for SourceHeaderChainAdapter {
- type Error = Error;
type MessagesProof = FromBridgedChainMessagesProof>>;
fn verify_messages_proof(
proof: Self::MessagesProof,
messages_count: u32,
- ) -> Result, Self::Error> {
+ ) -> Result, VerificationError> {
verify_messages_proof::(proof, messages_count)
}
}
@@ -357,7 +326,7 @@ pub mod target {
pub fn verify_messages_proof(
proof: FromBridgedChainMessagesProof>>,
messages_count: u32,
- ) -> Result, Error> {
+ ) -> Result, VerificationError> {
let FromBridgedChainMessagesProof {
bridged_header_hash,
storage_proof,
@@ -365,57 +334,52 @@ pub mod target {
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;
- B::BridgedHeaderChain::parse_finalized_storage_proof(
- bridged_header_hash,
- storage_proof,
- |storage| {
- let mut parser =
- StorageProofCheckerAdapter::<_, B> { storage, _dummy: Default::default() };
-
- // 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(Error::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(Error::EmptyMessageProof)
- }
-
- // check that the storage proof doesn't have any untouched trie nodes
- parser.storage.ensure_no_unused_nodes().map_err(Error::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)
- },
- )
- .map_err(Error::HeaderChain)?
+ // 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 {
@@ -427,7 +391,7 @@ pub mod target {
fn read_and_decode_outbound_lane_data(
&mut self,
lane_id: &LaneId,
- ) -> Result, Error> {
+ ) -> Result, VerificationError> {
let storage_outbound_lane_data_key = bp_messages::storage_keys::outbound_lane_data_key(
B::BRIDGED_MESSAGES_PALLET_NAME,
lane_id,
@@ -435,13 +399,13 @@ pub mod target {
self.storage
.read_and_decode_opt_value(storage_outbound_lane_data_key.0.as_ref())
- .map_err(Error::OutboundLaneStorage)
+ .map_err(VerificationError::OutboundLaneStorage)
}
fn read_and_decode_message_payload(
&mut self,
message_key: &MessageKey,
- ) -> Result {
+ ) -> Result {
let storage_message_key = bp_messages::storage_keys::message_key(
B::BRIDGED_MESSAGES_PALLET_NAME,
&message_key.lane_id,
@@ -449,7 +413,7 @@ pub mod target {
);
self.storage
.read_and_decode_mandatory_value(storage_message_key.0.as_ref())
- .map_err(Error::MessageStorage)
+ .map_err(VerificationError::MessageStorage)
}
}
}
@@ -470,8 +434,8 @@ mod tests {
},
mock::*,
};
- use bp_header_chain::StoredHeaderDataBuilder;
- use bp_runtime::HeaderId;
+ use bp_header_chain::{HeaderChainError, StoredHeaderDataBuilder};
+ use bp_runtime::{HeaderId, StorageProofError};
use codec::Encode;
use sp_core::H256;
use sp_runtime::traits::Header as _;
@@ -559,7 +523,7 @@ mod tests {
using_messages_proof(10, None, encode_all_messages, encode_lane_data, |proof| {
target::verify_messages_proof::(proof, 5)
}),
- Err(Error::MessagesCountMismatch),
+ Err(VerificationError::MessagesCountMismatch),
);
}
@@ -569,7 +533,7 @@ mod tests {
using_messages_proof(10, None, encode_all_messages, encode_lane_data, |proof| {
target::verify_messages_proof::(proof, 15)
}),
- Err(Error::MessagesCountMismatch),
+ Err(VerificationError::MessagesCountMismatch),
);
}
@@ -582,7 +546,7 @@ mod tests {
pallet_bridge_grandpa::ImportedHeaders::::remove(bridged_header_hash);
target::verify_messages_proof::(proof, 10)
}),
- Err(Error::HeaderChain(HeaderChainError::UnknownHeader)),
+ Err(VerificationError::HeaderChain(HeaderChainError::UnknownHeader)),
);
}
@@ -605,7 +569,7 @@ mod tests {
);
target::verify_messages_proof::(proof, 10)
}),
- Err(Error::HeaderChain(HeaderChainError::StorageProof(
+ Err(VerificationError::HeaderChain(HeaderChainError::StorageProof(
StorageProofError::StorageRootMismatch
))),
);
@@ -620,7 +584,7 @@ mod tests {
proof.storage_proof.push(node);
target::verify_messages_proof::(proof, 10)
},),
- Err(Error::HeaderChain(HeaderChainError::StorageProof(
+ Err(VerificationError::HeaderChain(HeaderChainError::StorageProof(
StorageProofError::DuplicateNodesInProof
))),
);
@@ -633,7 +597,7 @@ mod tests {
proof.storage_proof.push(vec![42]);
target::verify_messages_proof::(proof, 10)
},),
- Err(Error::StorageProof(StorageProofError::UnusedNodesInTheProof)),
+ Err(VerificationError::StorageProof(StorageProofError::UnusedNodesInTheProof)),
);
}
@@ -647,7 +611,7 @@ mod tests {
encode_lane_data,
|proof| target::verify_messages_proof::(proof, 10)
),
- Err(Error::MessageStorage(StorageProofError::StorageValueEmpty)),
+ Err(VerificationError::MessageStorage(StorageProofError::StorageValueEmpty)),
);
}
@@ -667,7 +631,7 @@ mod tests {
encode_lane_data,
|proof| target::verify_messages_proof::(proof, 10),
),
- Err(Error::MessageStorage(StorageProofError::StorageValueDecodeFailed(_))),
+ Err(VerificationError::MessageStorage(StorageProofError::StorageValueDecodeFailed(_))),
);
}
@@ -689,7 +653,9 @@ mod tests {
},
|proof| target::verify_messages_proof::(proof, 10),
),
- Err(Error::OutboundLaneStorage(StorageProofError::StorageValueDecodeFailed(_))),
+ Err(VerificationError::OutboundLaneStorage(
+ StorageProofError::StorageValueDecodeFailed(_)
+ )),
);
}
@@ -699,7 +665,7 @@ mod tests {
using_messages_proof(0, None, encode_all_messages, encode_lane_data, |proof| {
target::verify_messages_proof::(proof, 0)
},),
- Err(Error::EmptyMessageProof),
+ Err(VerificationError::EmptyMessageProof),
);
}
@@ -773,7 +739,7 @@ mod tests {
proof.nonces_end = u64::MAX;
target::verify_messages_proof::(proof, u32::MAX)
},),
- Err(Error::MessagesCountMismatch),
+ Err(VerificationError::MessagesCountMismatch),
);
}
}
diff --git a/bridges/bin/runtime-common/src/messages_call_ext.rs b/bridges/bin/runtime-common/src/messages_call_ext.rs
index 3f48ce583f9..8b4a50a0f30 100644
--- a/bridges/bin/runtime-common/src/messages_call_ext.rs
+++ b/bridges/bin/runtime-common/src/messages_call_ext.rs
@@ -47,7 +47,7 @@ pub struct BaseMessagesProofInfo {
impl BaseMessagesProofInfo {
/// Returns true if `bundled_range` continues the `0..=best_stored_nonce` range.
fn appends_to_stored_nonce(&self) -> bool {
- *self.bundled_range.start() == self.best_stored_nonce + 1
+ Some(*self.bundled_range.start()) == self.best_stored_nonce.checked_add(1)
}
}
diff --git a/bridges/bin/runtime-common/src/messages_generation.rs b/bridges/bin/runtime-common/src/messages_generation.rs
index 29a869a5c87..8dbf3abd683 100644
--- a/bridges/bin/runtime-common/src/messages_generation.rs
+++ b/bridges/bin/runtime-common/src/messages_generation.rs
@@ -16,8 +16,6 @@
//! Helpers for generating message storage proofs, that are used by tests and by benchmarks.
-#![cfg(any(feature = "runtime-benchmarks", test))]
-
use crate::messages::{BridgedChain, HashOf, HasherOf, MessageBridge};
use bp_messages::{
@@ -29,19 +27,19 @@ use sp_std::{ops::RangeInclusive, prelude::*};
use sp_trie::{trie_types::TrieDBMutBuilderV1, LayoutV1, MemoryDB, TrieMut};
/// Simple and correct message data encode function.
-pub(crate) fn encode_all_messages(_: MessageNonce, m: &MessagePayload) -> Option> {
+pub fn encode_all_messages(_: MessageNonce, m: &MessagePayload) -> Option> {
Some(m.encode())
}
/// Simple and correct outbound lane data encode function.
-pub(crate) fn encode_lane_data(d: &OutboundLaneData) -> Vec {
+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(crate) fn prepare_messages_storage_proof(
+pub fn prepare_messages_storage_proof(
lane: LaneId,
message_nonces: RangeInclusive,
outbound_lane_data: Option,
diff --git a/bridges/bin/runtime-common/src/mock.rs b/bridges/bin/runtime-common/src/mock.rs
index c1767199676..4542ad39b62 100644
--- a/bridges/bin/runtime-common/src/mock.rs
+++ b/bridges/bin/runtime-common/src/mock.rs
@@ -190,7 +190,7 @@ impl pallet_balances::Config for TestRuntime {
type MaxLocks = ConstU32<50>;
type MaxReserves = ConstU32<50>;
type ReserveIdentifier = [u8; 8];
- type HoldIdentifier = ();
+ type RuntimeHoldReason = RuntimeHoldReason;
type FreezeIdentifier = ();
type MaxHolds = ConstU32<0>;
type MaxFreezes = ConstU32<0>;
diff --git a/bridges/bin/runtime-common/src/refund_relayer_extension.rs b/bridges/bin/runtime-common/src/refund_relayer_extension.rs
index 00ea70aa04e..c5419837316 100644
--- a/bridges/bin/runtime-common/src/refund_relayer_extension.rs
+++ b/bridges/bin/runtime-common/src/refund_relayer_extension.rs
@@ -24,7 +24,7 @@ use crate::messages_call_ext::{
};
use bp_messages::{LaneId, MessageNonce};
use bp_relayers::{RewardsAccountOwner, RewardsAccountParams};
-use bp_runtime::{RangeInclusiveExt, StaticStrProvider};
+use bp_runtime::{Parachain, ParachainIdOf, RangeInclusiveExt, StaticStrProvider};
use codec::{Decode, Encode};
use frame_support::{
dispatch::{CallableCallFor, DispatchInfo, Dispatchable, PostDispatchInfo},
@@ -71,9 +71,9 @@ pub trait RefundableParachainId {
}
/// Default implementation of `RefundableParachainId`.
-pub struct RefundableParachain(PhantomData<(Instance, Id)>);
+pub struct DefaultRefundableParachainId(PhantomData<(Instance, Id)>);
-impl RefundableParachainId for RefundableParachain
+impl RefundableParachainId for DefaultRefundableParachainId
where
Id: Get,
{
@@ -81,6 +81,17 @@ where
type Id = Id;
}
+/// Implementation of `RefundableParachainId` for `trait Parachain`.
+pub struct RefundableParachain(PhantomData<(Instance, Para)>);
+
+impl RefundableParachainId for RefundableParachain
+where
+ Para: Parachain,
+{
+ type Instance = Instance;
+ type Id = ParachainIdOf;
+}
+
/// Trait identifying a bridged messages lane. A relayer might be refunded for delivering messages
/// coming from this lane.
pub trait RefundableMessagesLaneId {
@@ -682,7 +693,7 @@ mod tests {
bp_runtime::generate_static_str_provider!(TestExtension);
type TestExtension = RefundBridgedParachainMessages<
TestRuntime,
- RefundableParachain<(), TestParachain>,
+ DefaultRefundableParachainId<(), TestParachain>,
RefundableMessagesLane<(), TestLaneId>,
ActualFeeRefund,
ConstU64<1>,
diff --git a/bridges/modules/grandpa/Cargo.toml b/bridges/modules/grandpa/Cargo.toml
index 9b97b518fc5..ea8d00b8860 100644
--- a/bridges/modules/grandpa/Cargo.toml
+++ b/bridges/modules/grandpa/Cargo.toml
@@ -11,7 +11,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
finality-grandpa = { version = "0.16.2", default-features = false }
log = { version = "0.4.17", default-features = false }
-scale-info = { version = "2.6.0", default-features = false, features = ["derive"] }
+scale-info = { version = "2.7.0", default-features = false, features = ["derive"] }
# Bridge Dependencies
diff --git a/bridges/modules/grandpa/src/lib.rs b/bridges/modules/grandpa/src/lib.rs
index 329e4c21136..10b60878302 100644
--- a/bridges/modules/grandpa/src/lib.rs
+++ b/bridges/modules/grandpa/src/lib.rs
@@ -44,7 +44,7 @@ use bp_header_chain::{
};
use bp_runtime::{BlockNumberOf, HashOf, HasherOf, HeaderId, HeaderOf, OwnedBridgeModule};
use finality_grandpa::voter_set::VoterSet;
-use frame_support::{dispatch::PostDispatchInfo, ensure};
+use frame_support::{dispatch::PostDispatchInfo, ensure, DefaultNoBound};
use sp_consensus_grandpa::{ConsensusLog, GRANDPA_ENGINE_ID};
use sp_runtime::{
traits::{Header as HeaderT, Zero},
@@ -370,6 +370,7 @@ pub mod pallet {
StorageValue<_, BasicOperatingMode, ValueQuery>;
#[pallet::genesis_config]
+ #[derive(DefaultNoBound)]
pub struct GenesisConfig, I: 'static = ()> {
/// Optional module owner account.
pub owner: Option,
@@ -377,13 +378,6 @@ pub mod pallet {
pub init_data: Option>>,
}
- #[cfg(feature = "std")]
- impl, I: 'static> Default for GenesisConfig {
- fn default() -> Self {
- Self { owner: None, init_data: None }
- }
- }
-
#[pallet::genesis_build]
impl, I: 'static> GenesisBuild for GenesisConfig {
fn build(&self) {
@@ -1212,11 +1206,8 @@ mod tests {
fn parse_finalized_storage_proof_rejects_proof_on_unknown_header() {
run_test(|| {
assert_noop!(
- Pallet::::parse_finalized_storage_proof(
- Default::default(),
- vec![],
- |_| (),
- ),
+ Pallet::::storage_proof_checker(Default::default(), vec![],)
+ .map(|_| ()),
bp_header_chain::HeaderChainError::UnknownHeader,
);
});
@@ -1235,8 +1226,7 @@ mod tests {
>::insert(hash, header.build());
assert_ok!(
- Pallet::::parse_finalized_storage_proof(hash, storage_proof, |_| (),),
- (),
+ Pallet::::storage_proof_checker(hash, storage_proof).map(|_| ())
);
});
}
diff --git a/bridges/modules/messages/Cargo.toml b/bridges/modules/messages/Cargo.toml
index 639ac9dc23c..52fdea1df00 100644
--- a/bridges/modules/messages/Cargo.toml
+++ b/bridges/modules/messages/Cargo.toml
@@ -10,7 +10,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
log = { version = "0.4.17", default-features = false }
num-traits = { version = "0.2", default-features = false }
-scale-info = { version = "2.6.0", default-features = false, features = ["derive"] }
+scale-info = { version = "2.7.0", default-features = false, features = ["derive"] }
# Bridge dependencies
diff --git a/bridges/modules/messages/src/benchmarking.rs b/bridges/modules/messages/src/benchmarking.rs
index aab8855a729..04f64b53b30 100644
--- a/bridges/modules/messages/src/benchmarking.rs
+++ b/bridges/modules/messages/src/benchmarking.rs
@@ -17,8 +17,8 @@
//! Messages pallet benchmarking.
use crate::{
- inbound_lane::InboundLaneStorage, inbound_lane_storage, outbound_lane,
- weights_ext::EXPECTED_DEFAULT_MESSAGE_LENGTH, Call, OutboundLanes,
+ inbound_lane::InboundLaneStorage, outbound_lane, weights_ext::EXPECTED_DEFAULT_MESSAGE_LENGTH,
+ Call, OutboundLanes, RuntimeInboundLaneStorage,
};
use bp_messages::{
@@ -443,11 +443,12 @@ benchmarks_instance_pallet! {
fn send_regular_message, I: 'static>() {
let mut outbound_lane = outbound_lane::(T::bench_lane_id());
- outbound_lane.send_message(vec![]);
+ outbound_lane.send_message(vec![]).expect("We craft valid messages");
}
fn receive_messages, I: 'static>(nonce: MessageNonce) {
- let mut inbound_lane_storage = inbound_lane_storage::(T::bench_lane_id());
+ let mut inbound_lane_storage =
+ RuntimeInboundLaneStorage::::from_lane_id(T::bench_lane_id());
inbound_lane_storage.set_data(InboundLaneData {
relayers: vec![UnrewardedRelayer {
relayer: T::bridged_relayer_id(),
diff --git a/bridges/modules/messages/src/inbound_lane.rs b/bridges/modules/messages/src/inbound_lane.rs
index 5ec4444dbdf..b665b5516fc 100644
--- a/bridges/modules/messages/src/inbound_lane.rs
+++ b/bridges/modules/messages/src/inbound_lane.rs
@@ -40,7 +40,7 @@ pub trait InboundLaneStorage {
/// Return maximal number of unconfirmed messages in inbound lane.
fn max_unconfirmed_messages(&self) -> MessageNonce;
/// Get lane data from the storage.
- fn data(&self) -> InboundLaneData;
+ fn get_or_init_data(&mut self) -> InboundLaneData;
/// Update lane data in the storage.
fn set_data(&mut self, data: InboundLaneData);
}
@@ -117,9 +117,9 @@ impl InboundLane {
InboundLane { storage }
}
- /// Returns storage reference.
- pub fn storage(&self) -> &S {
- &self.storage
+ /// Returns `mut` storage reference.
+ pub fn storage_mut(&mut self) -> &mut S {
+ &mut self.storage
}
/// Receive state of the corresponding outbound lane.
@@ -127,7 +127,7 @@ impl InboundLane {
&mut self,
outbound_lane_data: OutboundLaneData,
) -> Option {
- let mut data = self.storage.data();
+ let mut data = self.storage.get_or_init_data();
let last_delivered_nonce = data.last_delivered_nonce();
if outbound_lane_data.latest_received_nonce > last_delivered_nonce {
@@ -170,9 +170,8 @@ impl InboundLane {
nonce: MessageNonce,
message_data: DispatchMessageData,
) -> ReceivalResult {
- let mut data = self.storage.data();
- let is_correct_message = nonce == data.last_delivered_nonce() + 1;
- if !is_correct_message {
+ let mut data = self.storage.get_or_init_data();
+ if Some(nonce) != data.last_delivered_nonce().checked_add(1) {
return ReceivalResult::InvalidNonce
}
@@ -252,7 +251,7 @@ mod tests {
None,
);
- assert_eq!(lane.storage.data().last_confirmed_nonce, 0);
+ assert_eq!(lane.storage.get_or_init_data().last_confirmed_nonce, 0);
});
}
@@ -270,7 +269,7 @@ mod tests {
}),
Some(3),
);
- assert_eq!(lane.storage.data().last_confirmed_nonce, 3);
+ assert_eq!(lane.storage.get_or_init_data().last_confirmed_nonce, 3);
assert_eq!(
lane.receive_state_update(OutboundLaneData {
@@ -279,7 +278,7 @@ mod tests {
}),
None,
);
- assert_eq!(lane.storage.data().last_confirmed_nonce, 3);
+ assert_eq!(lane.storage.get_or_init_data().last_confirmed_nonce, 3);
});
}
@@ -290,9 +289,9 @@ mod tests {
receive_regular_message(&mut lane, 1);
receive_regular_message(&mut lane, 2);
receive_regular_message(&mut lane, 3);
- assert_eq!(lane.storage.data().last_confirmed_nonce, 0);
+ assert_eq!(lane.storage.get_or_init_data().last_confirmed_nonce, 0);
assert_eq!(
- lane.storage.data().relayers,
+ lane.storage.get_or_init_data().relayers,
vec![unrewarded_relayer(1, 3, TEST_RELAYER_A)]
);
@@ -303,9 +302,9 @@ mod tests {
}),
Some(2),
);
- assert_eq!(lane.storage.data().last_confirmed_nonce, 2);
+ assert_eq!(lane.storage.get_or_init_data().last_confirmed_nonce, 2);
assert_eq!(
- lane.storage.data().relayers,
+ lane.storage.get_or_init_data().relayers,
vec![unrewarded_relayer(3, 3, TEST_RELAYER_A)]
);
@@ -316,8 +315,8 @@ mod tests {
}),
Some(3),
);
- assert_eq!(lane.storage.data().last_confirmed_nonce, 3);
- assert_eq!(lane.storage.data().relayers, vec![]);
+ assert_eq!(lane.storage.get_or_init_data().last_confirmed_nonce, 3);
+ assert_eq!(lane.storage.get_or_init_data().relayers, vec![]);
});
}
@@ -325,7 +324,7 @@ mod tests {
fn receive_status_update_works_with_batches_from_relayers() {
run_test(|| {
let mut lane = inbound_lane::(TEST_LANE_ID);
- let mut seed_storage_data = lane.storage.data();
+ let mut seed_storage_data = lane.storage.get_or_init_data();
// Prepare data
seed_storage_data.last_confirmed_nonce = 0;
seed_storage_data.relayers.push_back(unrewarded_relayer(1, 1, TEST_RELAYER_A));
@@ -341,9 +340,9 @@ mod tests {
}),
Some(3),
);
- assert_eq!(lane.storage.data().last_confirmed_nonce, 3);
+ assert_eq!(lane.storage.get_or_init_data().last_confirmed_nonce, 3);
assert_eq!(
- lane.storage.data().relayers,
+ lane.storage.get_or_init_data().relayers,
vec![
unrewarded_relayer(4, 4, TEST_RELAYER_B),
unrewarded_relayer(5, 5, TEST_RELAYER_C)
@@ -364,7 +363,7 @@ mod tests {
),
ReceivalResult::InvalidNonce
);
- assert_eq!(lane.storage.data().last_delivered_nonce(), 0);
+ assert_eq!(lane.storage.get_or_init_data().last_delivered_nonce(), 0);
});
}
@@ -470,7 +469,7 @@ mod tests {
ReceivalResult::Dispatched(dispatch_result(0))
);
assert_eq!(
- lane.storage.data().relayers,
+ lane.storage.get_or_init_data().relayers,
vec![
unrewarded_relayer(1, 1, TEST_RELAYER_A),
unrewarded_relayer(2, 2, TEST_RELAYER_B),
@@ -508,7 +507,7 @@ mod tests {
run_test(|| {
let mut lane = inbound_lane::(TEST_LANE_ID);
receive_regular_message(&mut lane, 1);
- assert_eq!(lane.storage.data().last_delivered_nonce(), 1);
+ assert_eq!(lane.storage.get_or_init_data().last_delivered_nonce(), 1);
});
}
diff --git a/bridges/modules/messages/src/lib.rs b/bridges/modules/messages/src/lib.rs
index 045015b7751..51e6857d777 100644
--- a/bridges/modules/messages/src/lib.rs
+++ b/bridges/modules/messages/src/lib.rs
@@ -48,7 +48,7 @@ pub use weights_ext::{
use crate::{
inbound_lane::{InboundLane, InboundLaneStorage},
- outbound_lane::{OutboundLane, OutboundLaneStorage, ReceivalConfirmationResult},
+ outbound_lane::{OutboundLane, OutboundLaneStorage, ReceivalConfirmationError},
};
use bp_messages::{
@@ -59,15 +59,15 @@ use bp_messages::{
DeliveryPayments, DispatchMessage, MessageDispatch, ProvedLaneMessages, ProvedMessages,
SourceHeaderChain,
},
- total_unrewarded_messages, DeliveredMessages, InboundLaneData, InboundMessageDetails, LaneId,
- MessageKey, MessageNonce, MessagePayload, MessagesOperatingMode, OutboundLaneData,
- OutboundMessageDetails, UnrewardedRelayersState,
+ DeliveredMessages, InboundLaneData, InboundMessageDetails, LaneId, MessageKey, MessageNonce,
+ MessagePayload, MessagesOperatingMode, OutboundLaneData, OutboundMessageDetails,
+ UnrewardedRelayersState, VerificationError,
};
use bp_runtime::{BasicOperatingMode, ChainId, OwnedBridgeModule, PreComputedSize, Size};
use codec::{Decode, Encode, MaxEncodedLen};
-use frame_support::{dispatch::PostDispatchInfo, ensure, fail, traits::Get};
+use frame_support::{dispatch::PostDispatchInfo, ensure, fail, traits::Get, DefaultNoBound};
use sp_runtime::traits::UniqueSaturatedFrom;
-use sp_std::{cell::RefCell, marker::PhantomData, prelude::*};
+use sp_std::{marker::PhantomData, prelude::*};
mod inbound_lane;
mod outbound_lane;
@@ -319,7 +319,7 @@ pub mod pallet {
// subtract extra storage proof bytes from the actual PoV size - there may be
// less unrewarded relayers than the maximal configured value
- let lane_extra_proof_size_bytes = lane.storage().extra_proof_size_bytes();
+ let lane_extra_proof_size_bytes = lane.storage_mut().extra_proof_size_bytes();
actual_weight = actual_weight.set_proof_size(
actual_weight.proof_size().saturating_sub(lane_extra_proof_size_bytes),
);
@@ -332,7 +332,7 @@ pub mod pallet {
"Received lane {:?} state update: latest_confirmed_nonce={}. Unrewarded relayers: {:?}",
lane_id,
updated_latest_confirmed_nonce,
- UnrewardedRelayersState::from(&lane.storage().data()),
+ UnrewardedRelayersState::from(&lane.storage_mut().get_or_init_data()),
);
}
}
@@ -437,57 +437,21 @@ pub mod pallet {
Error::::InvalidMessagesDeliveryProof
})?;
-
- // verify that the relayer has declared correct `lane_data::relayers` state
- // (we only care about total number of entries and messages, because this affects call
- // weight)
- ensure!(
- total_unrewarded_messages(&lane_data.relayers).unwrap_or(MessageNonce::MAX) ==
- relayers_state.total_messages &&
- lane_data.relayers.len() as MessageNonce ==
- relayers_state.unrewarded_relayer_entries,
- Error::::InvalidUnrewardedRelayersState
- );
- // the `last_delivered_nonce` field may also be used by the signed extension. Even
- // though providing wrong value isn't critical, let's also check it here.
ensure!(
- lane_data.last_delivered_nonce() == relayers_state.last_delivered_nonce,
+ relayers_state.is_valid(&lane_data),
Error::::InvalidUnrewardedRelayersState
);
// mark messages as delivered
let mut lane = outbound_lane::(lane_id);
let last_delivered_nonce = lane_data.last_delivered_nonce();
- let confirmed_messages = match lane.confirm_delivery(
- relayers_state.total_messages,
- last_delivered_nonce,
- &lane_data.relayers,
- ) {
- ReceivalConfirmationResult::ConfirmedMessages(confirmed_messages) =>
- Some(confirmed_messages),
- ReceivalConfirmationResult::NoNewConfirmations => None,
- ReceivalConfirmationResult::TryingToConfirmMoreMessagesThanExpected(
- to_confirm_messages_count,
- ) => {
- log::trace!(
- target: LOG_TARGET,
- "Messages delivery proof contains too many messages to confirm: {} vs declared {}",
- to_confirm_messages_count,
- relayers_state.total_messages,
- );
-
- fail!(Error::::TryingToConfirmMoreMessagesThanExpected);
- },
- error => {
- log::trace!(
- target: LOG_TARGET,
- "Messages delivery proof contains invalid unrewarded relayers vec: {:?}",
- error,
- );
-
- fail!(Error::::InvalidUnrewardedRelayers);
- },
- };
+ let confirmed_messages = lane
+ .confirm_delivery(
+ relayers_state.total_messages,
+ last_delivered_nonce,
+ &lane_data.relayers,
+ )
+ .map_err(Error::::ReceivalConfirmation)?;
if let Some(confirmed_messages) = confirmed_messages {
// emit 'delivered' event
@@ -554,12 +518,12 @@ pub mod pallet {
NotOperatingNormally,
/// The outbound lane is inactive.
InactiveOutboundLane,
- /// The message is too large to be sent over the bridge.
- MessageIsTooLarge,
/// Message has been treated as invalid by chain verifier.
- MessageRejectedByChainVerifier,
+ MessageRejectedByChainVerifier(VerificationError),
/// Message has been treated as invalid by lane verifier.
- MessageRejectedByLaneVerifier,
+ MessageRejectedByLaneVerifier(VerificationError),
+ /// Message has been treated as invalid by the pallet logic.
+ MessageRejectedByPallet(VerificationError),
/// Submitter has failed to pay fee for delivering and dispatching messages.
FailedToWithdrawMessageFee,
/// The transaction brings too many messages.
@@ -568,8 +532,6 @@ pub mod pallet {
InvalidMessagesProof,
/// Invalid messages delivery proof has been submitted.
InvalidMessagesDeliveryProof,
- /// The bridged chain has invalid `UnrewardedRelayers` in its storage (fatal for the lane).
- InvalidUnrewardedRelayers,
/// The relayer has declared invalid unrewarded relayers state in the
/// `receive_messages_delivery_proof` call.
InvalidUnrewardedRelayersState,
@@ -578,9 +540,8 @@ pub mod pallet {
InsufficientDispatchWeight,
/// The message someone is trying to work with (i.e. increase fee) is not yet sent.
MessageIsNotYetSent,
- /// The number of actually confirmed messages is going to be larger than the number of
- /// messages in the proof. This may mean that this or bridged chain storage is corrupted.
- TryingToConfirmMoreMessagesThanExpected,
+ /// Error confirming messages receival.
+ ReceivalConfirmation(ReceivalConfirmationError),
/// Error generated by the `OwnedBridgeModule` trait.
BridgeModule(bp_runtime::OwnedBridgeModuleError),
}
@@ -625,6 +586,7 @@ pub mod pallet {
StorageMap<_, Blake2_128Concat, MessageKey, StoredMessagePayload>;
#[pallet::genesis_config]
+ #[derive(DefaultNoBound)]
pub struct GenesisConfig, I: 'static = ()> {
/// Initial pallet operating mode.
pub operating_mode: MessagesOperatingMode,
@@ -634,17 +596,6 @@ pub mod pallet {
pub phantom: sp_std::marker::PhantomData,
}
- #[cfg(feature = "std")]
- impl, I: 'static> Default for GenesisConfig {
- fn default() -> Self {
- Self {
- operating_mode: Default::default(),
- owner: Default::default(),
- phantom: Default::default(),
- }
- }
- }
-
#[pallet::genesis_build]
impl, I: 'static> GenesisBuild for GenesisConfig {
fn build(&self) {
@@ -732,7 +683,7 @@ fn send_message, I: 'static>(
err,
);
- Error::::MessageRejectedByChainVerifier
+ Error::::MessageRejectedByChainVerifier(err)
})?;
// now let's enforce any additional lane rules
@@ -746,18 +697,16 @@ fn send_message, I: 'static>(
err,
);
- Error::::MessageRejectedByLaneVerifier
+ Error::::MessageRejectedByLaneVerifier(err)
},
)?;
// finally, save message in outbound storage and emit event
let encoded_payload = payload.encode();
let encoded_payload_len = encoded_payload.len();
- ensure!(
- encoded_payload_len <= T::MaximalOutboundPayloadSize::get() as usize,
- Error::::MessageIsTooLarge
- );
- let nonce = lane.send_message(encoded_payload);
+ let nonce = lane
+ .send_message(encoded_payload)
+ .map_err(Error::::MessageRejectedByPallet)?;
log::trace!(
target: LOG_TARGET,
@@ -787,18 +736,7 @@ fn ensure_normal_operating_mode, I: 'static>() -> Result<(), Error<
fn inbound_lane, I: 'static>(
lane_id: LaneId,
) -> InboundLane> {
- InboundLane::new(inbound_lane_storage::(lane_id))
-}
-
-/// Creates new runtime inbound lane storage.
-fn inbound_lane_storage, I: 'static>(
- lane_id: LaneId,
-) -> RuntimeInboundLaneStorage {
- RuntimeInboundLaneStorage {
- lane_id,
- cached_data: RefCell::new(None),
- _phantom: Default::default(),
- }
+ InboundLane::new(RuntimeInboundLaneStorage::from_lane_id(lane_id))
}
/// Creates new outbound lane object, backed by runtime storage.
@@ -811,10 +749,17 @@ fn outbound_lane, I: 'static>(
/// Runtime inbound lane storage.
struct RuntimeInboundLaneStorage, I: 'static = ()> {
lane_id: LaneId,
- cached_data: RefCell>>,
+ cached_data: Option>,
_phantom: PhantomData,
}
+impl, I: 'static> RuntimeInboundLaneStorage {
+ /// Creates new runtime inbound lane storage.
+ fn from_lane_id(lane_id: LaneId) -> RuntimeInboundLaneStorage {
+ RuntimeInboundLaneStorage { lane_id, cached_data: None, _phantom: Default::default() }
+ }
+}
+
impl, I: 'static> RuntimeInboundLaneStorage {
/// Returns number of bytes that may be subtracted from the PoV component of
/// `receive_messages_proof` call, because the actual inbound lane state is smaller than the
@@ -824,9 +769,9 @@ impl, I: 'static> RuntimeInboundLaneStorage {
/// `MaxUnrewardedRelayerEntriesAtInboundLane` constant from the pallet configuration. The PoV
/// of the call includes the maximal size of inbound lane state. If the actual size is smaller,
/// we may subtract extra bytes from this component.
- pub fn extra_proof_size_bytes(&self) -> u64 {
+ pub fn extra_proof_size_bytes(&mut self) -> u64 {
let max_encoded_len = StoredInboundLaneData::::max_encoded_len();
- let relayers_count = self.data().relayers.len();
+ let relayers_count = self.get_or_init_data().relayers.len();
let actual_encoded_len =
InboundLaneData::::encoded_size_hint(relayers_count)
.unwrap_or(usize::MAX);
@@ -849,26 +794,20 @@ impl, I: 'static> InboundLaneStorage for RuntimeInboundLaneStorage<
T::MaxUnconfirmedMessagesAtInboundLane::get()
}
- fn data(&self) -> InboundLaneData {
- match self.cached_data.clone().into_inner() {
- Some(data) => data,
+ fn get_or_init_data(&mut self) -> InboundLaneData {
+ match self.cached_data {
+ Some(ref data) => data.clone(),
None => {
let data: InboundLaneData =
InboundLanes::::get(self.lane_id).into();
- *self.cached_data.try_borrow_mut().expect(
- "we're in the single-threaded environment;\
- we have no recursive borrows; qed",
- ) = Some(data.clone());
+ self.cached_data = Some(data.clone());
data
},
}
}
fn set_data(&mut self, data: InboundLaneData) {
- *self.cached_data.try_borrow_mut().expect(
- "we're in the single-threaded environment;\
- we have no recursive borrows; qed",
- ) = Some(data.clone());
+ self.cached_data = Some(data.clone());
InboundLanes::::insert(self.lane_id, StoredInboundLaneData::(data))
}
}
@@ -898,15 +837,17 @@ impl, I: 'static> OutboundLaneStorage for RuntimeOutboundLaneStorag
.map(Into::into)
}
- fn save_message(&mut self, nonce: MessageNonce, message_payload: MessagePayload) {
+ fn save_message(
+ &mut self,
+ nonce: MessageNonce,
+ message_payload: MessagePayload,
+ ) -> Result<(), VerificationError> {
OutboundMessages::::insert(
MessageKey { lane_id: self.lane_id, nonce },
- StoredMessagePayload::::try_from(message_payload).expect(
- "save_message is called after all checks in send_message; \
- send_message checks message size; \
- qed",
- ),
+ StoredMessagePayload::::try_from(message_payload)
+ .map_err(|_| VerificationError::MessageTooLarge)?,
);
+ Ok(())
}
fn remove_message(&mut self, nonce: &MessageNonce) {
@@ -918,7 +859,7 @@ impl, I: 'static> OutboundLaneStorage for RuntimeOutboundLaneStorag
fn verify_and_decode_messages_proof(
proof: Chain::MessagesProof,
messages_count: u32,
-) -> Result>, Chain::Error> {
+) -> Result>, VerificationError> {
// `receive_messages_proof` weight formula and `MaxUnconfirmedMessagesAtInboundLane` check
// guarantees that the `message_count` is sane and Vec may be allocated.
// (tx with too many messages will either be rejected from the pool, or will fail earlier)
@@ -941,13 +882,16 @@ fn verify_and_decode_messages_proof::MessageIsTooLarge,
+ Error::::MessageRejectedByPallet(
+ VerificationError::MessageTooLarge
+ ),
);
// let's check that we're able to send `MAX_OUTBOUND_PAYLOAD_SIZE` messages
@@ -1177,7 +1123,9 @@ mod tests {
TEST_LANE_ID,
PAYLOAD_REJECTED_BY_TARGET_CHAIN,
),
- Error::::MessageRejectedByChainVerifier,
+ Error::::MessageRejectedByChainVerifier(VerificationError::Other(
+ mock::TEST_ERROR
+ )),
);
});
}
@@ -1190,7 +1138,9 @@ mod tests {
message.reject_by_lane_verifier = true;
assert_noop!(
send_message::(RuntimeOrigin::signed(1), TEST_LANE_ID, message,),
- Error::::MessageRejectedByLaneVerifier,
+ Error::::MessageRejectedByLaneVerifier(VerificationError::Other(
+ mock::TEST_ERROR
+ )),
);
});
}
@@ -1368,9 +1318,9 @@ mod tests {
single_message_delivery_proof,
UnrewardedRelayersState {
unrewarded_relayer_entries: 1,
+ messages_in_oldest_entry: 1,
total_messages: 1,
last_delivered_nonce: 1,
- ..Default::default()
},
);
assert_ok!(result);
@@ -1408,9 +1358,9 @@ mod tests {
two_messages_delivery_proof,
UnrewardedRelayersState {
unrewarded_relayer_entries: 2,
+ messages_in_oldest_entry: 1,
total_messages: 2,
last_delivered_nonce: 2,
- ..Default::default()
},
);
assert_ok!(result);
@@ -1773,9 +1723,9 @@ mod tests {
TestMessagesDeliveryProof(messages_1_and_2_proof),
UnrewardedRelayersState {
unrewarded_relayer_entries: 1,
+ messages_in_oldest_entry: 2,
total_messages: 2,
last_delivered_nonce: 2,
- ..Default::default()
},
));
// second tx with message 3
@@ -1784,9 +1734,9 @@ mod tests {
TestMessagesDeliveryProof(messages_3_proof),
UnrewardedRelayersState {
unrewarded_relayer_entries: 1,
+ messages_in_oldest_entry: 1,
total_messages: 1,
last_delivered_nonce: 3,
- ..Default::default()
},
));
});
@@ -1814,7 +1764,9 @@ mod tests {
))),
UnrewardedRelayersState { last_delivered_nonce: 1, ..Default::default() },
),
- Error::::TryingToConfirmMoreMessagesThanExpected,
+ Error::::ReceivalConfirmation(
+ ReceivalConfirmationError::TryingToConfirmMoreMessagesThanExpected
+ ),
);
});
}
@@ -2114,10 +2066,10 @@ mod tests {
fn storage(relayer_entries: usize) -> RuntimeInboundLaneStorage {
RuntimeInboundLaneStorage {
lane_id: Default::default(),
- cached_data: RefCell::new(Some(InboundLaneData {
+ cached_data: Some(InboundLaneData {
relayers: vec![relayer_entry(); relayer_entries].into_iter().collect(),
last_confirmed_nonce: 0,
- })),
+ }),
_phantom: Default::default(),
}
}
diff --git a/bridges/modules/messages/src/mock.rs b/bridges/modules/messages/src/mock.rs
index 2e45d5b601f..8716c5bc3ac 100644
--- a/bridges/modules/messages/src/mock.rs
+++ b/bridges/modules/messages/src/mock.rs
@@ -27,7 +27,7 @@ use bp_messages::{
ProvedLaneMessages, ProvedMessages, SourceHeaderChain,
},
DeliveredMessages, InboundLaneData, LaneId, Message, MessageKey, MessageNonce, MessagePayload,
- OutboundLaneData, UnrewardedRelayer, UnrewardedRelayersState,
+ OutboundLaneData, UnrewardedRelayer, UnrewardedRelayersState, VerificationError,
};
use bp_runtime::{messages::MessageDispatchResult, Size};
use codec::{Decode, Encode};
@@ -133,7 +133,7 @@ impl pallet_balances::Config for TestRuntime {
type WeightInfo = ();
type MaxReserves = ();
type ReserveIdentifier = ();
- type HoldIdentifier = ();
+ type RuntimeHoldReason = RuntimeHoldReason;
type FreezeIdentifier = ();
type MaxHolds = ConstU32<0>;
type MaxFreezes = ConstU32<0>;
@@ -295,13 +295,11 @@ impl Size for TestMessagesDeliveryProof {
pub struct TestTargetHeaderChain;
impl TargetHeaderChain for TestTargetHeaderChain {
- type Error = &'static str;
-
type MessagesDeliveryProof = TestMessagesDeliveryProof;
- fn verify_message(payload: &TestPayload) -> Result<(), Self::Error> {
+ fn verify_message(payload: &TestPayload) -> Result<(), VerificationError> {
if *payload == PAYLOAD_REJECTED_BY_TARGET_CHAIN {
- Err(TEST_ERROR)
+ Err(VerificationError::Other(TEST_ERROR))
} else {
Ok(())
}
@@ -309,8 +307,8 @@ impl TargetHeaderChain for TestTargetHeaderChain {
fn verify_messages_delivery_proof(
proof: Self::MessagesDeliveryProof,
- ) -> Result<(LaneId, InboundLaneData), Self::Error> {
- proof.0.map_err(|_| TEST_ERROR)
+ ) -> Result<(LaneId, InboundLaneData), VerificationError> {
+ proof.0.map_err(|_| VerificationError::Other(TEST_ERROR))
}
}
@@ -319,18 +317,16 @@ impl TargetHeaderChain for TestTargetHeaderChain {
pub struct TestLaneMessageVerifier;
impl LaneMessageVerifier for TestLaneMessageVerifier {
- type Error = &'static str;
-
fn verify_message(
_submitter: &RuntimeOrigin,
_lane: &LaneId,
_lane_outbound_data: &OutboundLaneData,
payload: &TestPayload,
- ) -> Result<(), Self::Error> {
+ ) -> Result<(), VerificationError> {
if !payload.reject_by_lane_verifier {
Ok(())
} else {
- Err(TEST_ERROR)
+ Err(VerificationError::Other(TEST_ERROR))
}
}
}
@@ -400,15 +396,16 @@ impl DeliveryConfirmationPayments for TestDeliveryConfirmationPayment
pub struct TestSourceHeaderChain;
impl SourceHeaderChain for TestSourceHeaderChain {
- type Error = &'static str;
-
type MessagesProof = TestMessagesProof;
fn verify_messages_proof(
proof: Self::MessagesProof,
_messages_count: u32,
- ) -> Result, Self::Error> {
- proof.result.map(|proof| proof.into_iter().collect()).map_err(|_| TEST_ERROR)
+ ) -> Result, VerificationError> {
+ proof
+ .result
+ .map(|proof| proof.into_iter().collect())
+ .map_err(|_| VerificationError::Other(TEST_ERROR))
}
}
diff --git a/bridges/modules/messages/src/outbound_lane.rs b/bridges/modules/messages/src/outbound_lane.rs
index 3d0d4de966a..0cf0c4ccb42 100644
--- a/bridges/modules/messages/src/outbound_lane.rs
+++ b/bridges/modules/messages/src/outbound_lane.rs
@@ -16,16 +16,19 @@
//! Everything about outgoing messages sending.
-use crate::Config;
+use crate::{Config, LOG_TARGET};
use bp_messages::{
DeliveredMessages, LaneId, MessageNonce, MessagePayload, OutboundLaneData, UnrewardedRelayer,
+ VerificationError,
};
+use codec::{Decode, Encode};
use frame_support::{
weights::{RuntimeDbWeight, Weight},
- BoundedVec, RuntimeDebug,
+ BoundedVec, PalletError, RuntimeDebug,
};
use num_traits::Zero;
+use scale_info::TypeInfo;
use sp_std::collections::vec_deque::VecDeque;
/// Outbound lane storage.
@@ -40,7 +43,11 @@ pub trait OutboundLaneStorage {
#[cfg(test)]
fn message(&self, nonce: &MessageNonce) -> Option;
/// Save outbound message in the storage.
- fn save_message(&mut self, nonce: MessageNonce, message_payload: MessagePayload);
+ fn save_message(
+ &mut self,
+ nonce: MessageNonce,
+ message_payload: MessagePayload,
+ ) -> Result<(), VerificationError>;
/// Remove outbound message from the storage.
fn remove_message(&mut self, nonce: &MessageNonce);
}
@@ -49,13 +56,8 @@ pub trait OutboundLaneStorage {
pub type StoredMessagePayload = BoundedVec>::MaximalOutboundPayloadSize>;
/// Result of messages receival confirmation.
-#[derive(RuntimeDebug, PartialEq, Eq)]
-pub enum ReceivalConfirmationResult {
- /// New messages have been confirmed by the confirmation transaction.
- ConfirmedMessages(DeliveredMessages),
- /// Confirmation transaction brings no new confirmation. This may be a result of relayer
- /// error or several relayers running.
- NoNewConfirmations,
+#[derive(Encode, Decode, RuntimeDebug, PartialEq, Eq, PalletError, TypeInfo)]
+pub enum ReceivalConfirmationError {
/// Bridged chain is trying to confirm more messages than we have generated. May be a result
/// of invalid bridged chain storage.
FailedToConfirmFutureMessages,
@@ -66,7 +68,7 @@ pub enum ReceivalConfirmationResult {
/// bridged chain storage.
NonConsecutiveUnrewardedRelayerEntries,
/// The chain has more messages that need to be confirmed than there is in the proof.
- TryingToConfirmMoreMessagesThanExpected(MessageNonce),
+ TryingToConfirmMoreMessagesThanExpected,
}
/// Outbound messages lane.
@@ -88,15 +90,18 @@ impl OutboundLane {
/// Send message over lane.
///
/// Returns new message nonce.
- pub fn send_message(&mut self, message_payload: MessagePayload) -> MessageNonce {
+ pub fn send_message(
+ &mut self,
+ message_payload: MessagePayload,
+ ) -> Result {
let mut data = self.storage.data();
let nonce = data.latest_generated_nonce + 1;
data.latest_generated_nonce = nonce;
- self.storage.save_message(nonce, message_payload);
+ self.storage.save_message(nonce, message_payload)?;
self.storage.set_data(data);
- nonce
+ Ok(nonce)
}
/// Confirm messages delivery.
@@ -105,37 +110,39 @@ impl OutboundLane {
max_allowed_messages: MessageNonce,
latest_delivered_nonce: MessageNonce,
relayers: &VecDeque>,
- ) -> ReceivalConfirmationResult {
+ ) -> Result, ReceivalConfirmationError> {
let mut data = self.storage.data();
- if latest_delivered_nonce <= data.latest_received_nonce {
- return ReceivalConfirmationResult::NoNewConfirmations
+ let confirmed_messages = DeliveredMessages {
+ begin: data.latest_received_nonce.saturating_add(1),
+ end: latest_delivered_nonce,
+ };
+ if confirmed_messages.total_messages() == 0 {
+ return Ok(None)
}
- if latest_delivered_nonce > data.latest_generated_nonce {
- return ReceivalConfirmationResult::FailedToConfirmFutureMessages
+ if confirmed_messages.end > data.latest_generated_nonce {
+ return Err(ReceivalConfirmationError::FailedToConfirmFutureMessages)
}
- if latest_delivered_nonce - data.latest_received_nonce > max_allowed_messages {
+ if confirmed_messages.total_messages() > max_allowed_messages {
// that the relayer has declared correct number of messages that the proof contains (it
// is checked outside of the function). But it may happen (but only if this/bridged
// chain storage is corrupted, though) that the actual number of confirmed messages if
// larger than declared. This would mean that 'reward loop' will take more time than the
// weight formula accounts, so we can't allow that.
- return ReceivalConfirmationResult::TryingToConfirmMoreMessagesThanExpected(
- latest_delivered_nonce - data.latest_received_nonce,
- )
+ log::trace!(
+ target: LOG_TARGET,
+ "Messages delivery proof contains too many messages to confirm: {} vs declared {}",
+ confirmed_messages.total_messages(),
+ max_allowed_messages,
+ );
+ return Err(ReceivalConfirmationError::TryingToConfirmMoreMessagesThanExpected)
}
- if let Err(e) = ensure_unrewarded_relayers_are_correct(latest_delivered_nonce, relayers) {
- return e
- }
+ ensure_unrewarded_relayers_are_correct(confirmed_messages.end, relayers)?;
- let prev_latest_received_nonce = data.latest_received_nonce;
- data.latest_received_nonce = latest_delivered_nonce;
+ data.latest_received_nonce = confirmed_messages.end;
self.storage.set_data(data);
- ReceivalConfirmationResult::ConfirmedMessages(DeliveredMessages {
- begin: prev_latest_received_nonce + 1,
- end: latest_delivered_nonce,
- })
+ Ok(Some(confirmed_messages))
}
/// Prune at most `max_messages_to_prune` already received messages.
@@ -176,27 +183,24 @@ impl OutboundLane {
fn ensure_unrewarded_relayers_are_correct(
latest_received_nonce: MessageNonce,
relayers: &VecDeque>,
-) -> Result<(), ReceivalConfirmationResult> {
- let mut last_entry_end: Option = None;
+) -> Result<(), ReceivalConfirmationError> {
+ let mut expected_entry_begin = relayers.front().map(|entry| entry.messages.begin);
for entry in relayers {
// unrewarded relayer entry must have at least 1 unconfirmed message
// (guaranteed by the `InboundLane::receive_message()`)
if entry.messages.end < entry.messages.begin {
- return Err(ReceivalConfirmationResult::EmptyUnrewardedRelayerEntry)
+ return Err(ReceivalConfirmationError::EmptyUnrewardedRelayerEntry)
}
// every entry must confirm range of messages that follows previous entry range
// (guaranteed by the `InboundLane::receive_message()`)
- if let Some(last_entry_end) = last_entry_end {
- let expected_entry_begin = last_entry_end.checked_add(1);
- if expected_entry_begin != Some(entry.messages.begin) {
- return Err(ReceivalConfirmationResult::NonConsecutiveUnrewardedRelayerEntries)
- }
+ if expected_entry_begin != Some(entry.messages.begin) {
+ return Err(ReceivalConfirmationError::NonConsecutiveUnrewardedRelayerEntries)
}
- last_entry_end = Some(entry.messages.end);
+ expected_entry_begin = entry.messages.end.checked_add(1);
// entry can't confirm messages larger than `inbound_lane_data.latest_received_nonce()`
// (guaranteed by the `InboundLane::receive_message()`)
if entry.messages.end > latest_received_nonce {
- return Err(ReceivalConfirmationResult::FailedToConfirmFutureMessages)
+ return Err(ReceivalConfirmationError::FailedToConfirmFutureMessages)
}
}
@@ -213,7 +217,7 @@ mod tests {
},
outbound_lane,
};
- use frame_support::weights::constants::RocksDbWeight;
+ use frame_support::{assert_ok, weights::constants::RocksDbWeight};
use sp_std::ops::RangeInclusive;
fn unrewarded_relayers(
@@ -231,12 +235,12 @@ mod tests {
fn assert_3_messages_confirmation_fails(
latest_received_nonce: MessageNonce,
relayers: &VecDeque>,
- ) -> ReceivalConfirmationResult {
+ ) -> Result, ReceivalConfirmationError> {
run_test(|| {
let mut lane = outbound_lane::(TEST_LANE_ID);
- lane.send_message(outbound_message_data(REGULAR_PAYLOAD));
- lane.send_message(outbound_message_data(REGULAR_PAYLOAD));
- lane.send_message(outbound_message_data(REGULAR_PAYLOAD));
+ assert_ok!(lane.send_message(outbound_message_data(REGULAR_PAYLOAD)));
+ assert_ok!(lane.send_message(outbound_message_data(REGULAR_PAYLOAD)));
+ assert_ok!(lane.send_message(outbound_message_data(REGULAR_PAYLOAD)));
assert_eq!(lane.storage.data().latest_generated_nonce, 3);
assert_eq!(lane.storage.data().latest_received_nonce, 0);
let result = lane.confirm_delivery(3, latest_received_nonce, relayers);
@@ -251,7 +255,7 @@ mod tests {
run_test(|| {
let mut lane = outbound_lane::(TEST_LANE_ID);
assert_eq!(lane.storage.data().latest_generated_nonce, 0);
- assert_eq!(lane.send_message(outbound_message_data(REGULAR_PAYLOAD)), 1);
+ assert_eq!(lane.send_message(outbound_message_data(REGULAR_PAYLOAD)), Ok(1));
assert!(lane.storage.message(&1).is_some());
assert_eq!(lane.storage.data().latest_generated_nonce, 1);
});
@@ -261,14 +265,14 @@ mod tests {
fn confirm_delivery_works() {
run_test(|| {
let mut lane = outbound_lane::(TEST_LANE_ID);
- assert_eq!(lane.send_message(outbound_message_data(REGULAR_PAYLOAD)), 1);
- assert_eq!(lane.send_message(outbound_message_data(REGULAR_PAYLOAD)), 2);
- assert_eq!(lane.send_message(outbound_message_data(REGULAR_PAYLOAD)), 3);
+ assert_eq!(lane.send_message(outbound_message_data(REGULAR_PAYLOAD)), Ok(1));
+ assert_eq!(lane.send_message(outbound_message_data(REGULAR_PAYLOAD)), Ok(2));
+ assert_eq!(lane.send_message(outbound_message_data(REGULAR_PAYLOAD)), Ok(3));
assert_eq!(lane.storage.data().latest_generated_nonce, 3);
assert_eq!(lane.storage.data().latest_received_nonce, 0);
assert_eq!(
lane.confirm_delivery(3, 3, &unrewarded_relayers(1..=3)),
- ReceivalConfirmationResult::ConfirmedMessages(delivered_messages(1..=3)),
+ Ok(Some(delivered_messages(1..=3))),
);
assert_eq!(lane.storage.data().latest_generated_nonce, 3);
assert_eq!(lane.storage.data().latest_received_nonce, 3);
@@ -279,26 +283,20 @@ mod tests {
fn confirm_delivery_rejects_nonce_lesser_than_latest_received() {
run_test(|| {
let mut lane = outbound_lane::(TEST_LANE_ID);
- lane.send_message(outbound_message_data(REGULAR_PAYLOAD));
- lane.send_message(outbound_message_data(REGULAR_PAYLOAD));
- lane.send_message(outbound_message_data(REGULAR_PAYLOAD));
+ assert_ok!(lane.send_message(outbound_message_data(REGULAR_PAYLOAD)));
+ assert_ok!(lane.send_message(outbound_message_data(REGULAR_PAYLOAD)));
+ assert_ok!(lane.send_message(outbound_message_data(REGULAR_PAYLOAD)));
assert_eq!(lane.storage.data().latest_generated_nonce, 3);
assert_eq!(lane.storage.data().latest_received_nonce, 0);
assert_eq!(
lane.confirm_delivery(3, 3, &unrewarded_relayers(1..=3)),
- ReceivalConfirmationResult::ConfirmedMessages(delivered_messages(1..=3)),
- );
- assert_eq!(
- lane.confirm_delivery(3, 3, &unrewarded_relayers(1..=3)),
- ReceivalConfirmationResult::NoNewConfirmations,
+ Ok(Some(delivered_messages(1..=3))),
);
+ assert_eq!(lane.confirm_delivery(3, 3, &unrewarded_relayers(1..=3)), Ok(None),);
assert_eq!(lane.storage.data().latest_generated_nonce, 3);
assert_eq!(lane.storage.data().latest_received_nonce, 3);
- assert_eq!(
- lane.confirm_delivery(1, 2, &unrewarded_relayers(1..=1)),
- ReceivalConfirmationResult::NoNewConfirmations,
- );
+ assert_eq!(lane.confirm_delivery(1, 2, &unrewarded_relayers(1..=1)), Ok(None),);
assert_eq!(lane.storage.data().latest_generated_nonce, 3);
assert_eq!(lane.storage.data().latest_received_nonce, 3);
});
@@ -308,7 +306,7 @@ mod tests {
fn confirm_delivery_rejects_nonce_larger_than_last_generated() {
assert_eq!(
assert_3_messages_confirmation_fails(10, &unrewarded_relayers(1..=10),),
- ReceivalConfirmationResult::FailedToConfirmFutureMessages,
+ Err(ReceivalConfirmationError::FailedToConfirmFutureMessages),
);
}
@@ -323,7 +321,7 @@ mod tests {
.chain(unrewarded_relayers(3..=3).into_iter())
.collect(),
),
- ReceivalConfirmationResult::FailedToConfirmFutureMessages,
+ Err(ReceivalConfirmationError::FailedToConfirmFutureMessages),
);
}
@@ -339,7 +337,7 @@ mod tests {
.chain(unrewarded_relayers(2..=3).into_iter())
.collect(),
),
- ReceivalConfirmationResult::EmptyUnrewardedRelayerEntry,
+ Err(ReceivalConfirmationError::EmptyUnrewardedRelayerEntry),
);
}
@@ -354,7 +352,7 @@ mod tests {
.chain(unrewarded_relayers(2..=2).into_iter())
.collect(),
),
- ReceivalConfirmationResult::NonConsecutiveUnrewardedRelayerEntries,
+ Err(ReceivalConfirmationError::NonConsecutiveUnrewardedRelayerEntries),
);
}
@@ -369,9 +367,9 @@ mod tests {
);
assert_eq!(lane.storage.data().oldest_unpruned_nonce, 1);
// when nothing is confirmed, nothing is pruned
- lane.send_message(outbound_message_data(REGULAR_PAYLOAD));
- lane.send_message(outbound_message_data(REGULAR_PAYLOAD));
- lane.send_message(outbound_message_data(REGULAR_PAYLOAD));
+ assert_ok!(lane.send_message(outbound_message_data(REGULAR_PAYLOAD)));
+ assert_ok!(lane.send_message(outbound_message_data(REGULAR_PAYLOAD)));
+ assert_ok!(lane.send_message(outbound_message_data(REGULAR_PAYLOAD)));
assert!(lane.storage.message(&1).is_some());
assert!(lane.storage.message(&2).is_some());
assert!(lane.storage.message(&3).is_some());
@@ -383,7 +381,7 @@ mod tests {
// after confirmation, some messages are received
assert_eq!(
lane.confirm_delivery(2, 2, &unrewarded_relayers(1..=2)),
- ReceivalConfirmationResult::ConfirmedMessages(delivered_messages(1..=2)),
+ Ok(Some(delivered_messages(1..=2))),
);
assert_eq!(
lane.prune_messages(RocksDbWeight::get(), RocksDbWeight::get().writes(101)),
@@ -396,7 +394,7 @@ mod tests {
// after last message is confirmed, everything is pruned
assert_eq!(
lane.confirm_delivery(1, 3, &unrewarded_relayers(3..=3)),
- ReceivalConfirmationResult::ConfirmedMessages(delivered_messages(3..=3)),
+ Ok(Some(delivered_messages(3..=3))),
);
assert_eq!(
lane.prune_messages(RocksDbWeight::get(), RocksDbWeight::get().writes(101)),
@@ -413,20 +411,20 @@ mod tests {
fn confirm_delivery_detects_when_more_than_expected_messages_are_confirmed() {
run_test(|| {
let mut lane = outbound_lane::(TEST_LANE_ID);
- lane.send_message(outbound_message_data(REGULAR_PAYLOAD));
- lane.send_message(outbound_message_data(REGULAR_PAYLOAD));
- lane.send_message(outbound_message_data(REGULAR_PAYLOAD));
+ assert_ok!(lane.send_message(outbound_message_data(REGULAR_PAYLOAD)));
+ assert_ok!(lane.send_message(outbound_message_data(REGULAR_PAYLOAD)));
+ assert_ok!(lane.send_message(outbound_message_data(REGULAR_PAYLOAD)));
assert_eq!(
lane.confirm_delivery(0, 3, &unrewarded_relayers(1..=3)),
- ReceivalConfirmationResult::TryingToConfirmMoreMessagesThanExpected(3),
+ Err(ReceivalConfirmationError::TryingToConfirmMoreMessagesThanExpected),
);
assert_eq!(
lane.confirm_delivery(2, 3, &unrewarded_relayers(1..=3)),
- ReceivalConfirmationResult::TryingToConfirmMoreMessagesThanExpected(3),
+ Err(ReceivalConfirmationError::TryingToConfirmMoreMessagesThanExpected),
);
assert_eq!(
lane.confirm_delivery(3, 3, &unrewarded_relayers(1..=3)),
- ReceivalConfirmationResult::ConfirmedMessages(delivered_messages(1..=3)),
+ Ok(Some(delivered_messages(1..=3))),
);
});
}
diff --git a/bridges/modules/parachains/Cargo.toml b/bridges/modules/parachains/Cargo.toml
index d8c89b79991..147111fd4ce 100644
--- a/bridges/modules/parachains/Cargo.toml
+++ b/bridges/modules/parachains/Cargo.toml
@@ -8,7 +8,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
[dependencies]
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
log = { version = "0.4.17", default-features = false }
-scale-info = { version = "2.6.0", default-features = false, features = ["derive"] }
+scale-info = { version = "2.7.0", default-features = false, features = ["derive"] }
# Bridge Dependencies
diff --git a/bridges/modules/parachains/src/lib.rs b/bridges/modules/parachains/src/lib.rs
index 6c89b09513c..b17b52163d8 100644
--- a/bridges/modules/parachains/src/lib.rs
+++ b/bridges/modules/parachains/src/lib.rs
@@ -30,7 +30,7 @@ use bp_header_chain::{HeaderChain, HeaderChainError};
use bp_parachains::{parachain_head_storage_key_at_source, ParaInfo, ParaStoredHeaderData};
use bp_polkadot_core::parachains::{ParaHash, ParaHead, ParaHeadsProof, ParaId};
use bp_runtime::{Chain, HashOf, HeaderId, HeaderIdOf, Parachain, StorageProofError};
-use frame_support::dispatch::PostDispatchInfo;
+use frame_support::{dispatch::PostDispatchInfo, DefaultNoBound};
use sp_std::{marker::PhantomData, vec::Vec};
#[cfg(feature = "runtime-benchmarks")]
@@ -91,6 +91,8 @@ pub mod pallet {
BoundedStorageValue<>::MaxParaHeadDataSize, ParaStoredHeaderData>;
/// Weight info of the given parachains pallet.
pub type WeightInfoOf = >::WeightInfo;
+ type GrandpaPalletOf =
+ pallet_bridge_grandpa::Pallet>::BridgesGrandpaPalletInstance>;
#[pallet::event]
#[pallet::generate_deposit(pub(super) fn deposit_event)]
@@ -125,14 +127,8 @@ pub mod pallet {
UnknownRelayChainBlock,
/// The number of stored relay block is different from what the relayer has provided.
InvalidRelayChainBlockNumber,
- /// Error generated by a method defined in `bp-header-chain`.
- HeaderChain(HeaderChainError),
- /// Given parachain head is unknown.
- UnknownParaHead,
- /// The storage proof doesn't contains storage root. So it is invalid for given header.
- StorageRootMismatch,
- /// Failed to extract state root from given parachain head.
- FailedToExtractStateRoot,
+ /// Parachain heads storage proof is invalid.
+ HeaderChainStorageProof(HeaderChainError),
/// Error generated by the `OwnedBridgeModule` trait.
BridgeModule(bp_runtime::OwnedBridgeModuleError),
}
@@ -337,112 +333,113 @@ pub mod pallet {
parachains.len() as _,
);
- pallet_bridge_grandpa::Pallet::::parse_finalized_storage_proof(
+ let mut storage = GrandpaPalletOf::::storage_proof_checker(
relay_block_hash,
parachain_heads_proof.0,
- move |mut storage| {
- for (parachain, parachain_head_hash) in parachains {
- let parachain_head = match Pallet::::read_parachain_head(&mut storage, parachain) {
- Ok(Some(parachain_head)) => parachain_head,
- Ok(None) => {
- log::trace!(
- target: LOG_TARGET,
- "The head of parachain {:?} is None. {}",
- parachain,
- if ParasInfo::::contains_key(parachain) {
- "Looks like it is not yet registered at the source relay chain"
- } else {
- "Looks like it has been deregistered from the source relay chain"
- },
- );
- Self::deposit_event(Event::MissingParachainHead { parachain });
- continue;
- },
- Err(e) => {
- log::trace!(
- target: LOG_TARGET,
- "The read of head of parachain {:?} has failed: {:?}",
- parachain,
- e,
- );
- Self::deposit_event(Event::MissingParachainHead { parachain });
- continue;
+ )
+ .map_err(Error::::HeaderChainStorageProof)?;
+
+ for (parachain, parachain_head_hash) in parachains {
+ let parachain_head = match Self::read_parachain_head(&mut storage, parachain) {
+ Ok(Some(parachain_head)) => parachain_head,
+ Ok(None) => {
+ log::trace!(
+ target: LOG_TARGET,
+ "The head of parachain {:?} is None. {}",
+ parachain,
+ if ParasInfo::::contains_key(parachain) {
+ "Looks like it is not yet registered at the source relay chain"
+ } else {
+ "Looks like it has been deregistered from the source relay chain"
},
- };
+ );
+ Self::deposit_event(Event::MissingParachainHead { parachain });
+ continue
+ },
+ Err(e) => {
+ log::trace!(
+ target: LOG_TARGET,
+ "The read of head of parachain {:?} has failed: {:?}",
+ parachain,
+ e,
+ );
+ Self::deposit_event(Event::MissingParachainHead { parachain });
+ continue
+ },
+ };
+
+ // if relayer has specified invalid parachain head hash, ignore the head
+ // (this isn't strictly necessary, but better safe than sorry)
+ let actual_parachain_head_hash = parachain_head.hash();
+ if parachain_head_hash != actual_parachain_head_hash {
+ log::trace!(
+ target: LOG_TARGET,
+ "The submitter has specified invalid parachain {:?} head hash: \
+ {:?} vs {:?}",
+ parachain,
+ parachain_head_hash,
+ actual_parachain_head_hash,
+ );
+ Self::deposit_event(Event::IncorrectParachainHeadHash {
+ parachain,
+ parachain_head_hash,
+ actual_parachain_head_hash,
+ });
+ continue
+ }
- // if relayer has specified invalid parachain head hash, ignore the head
- // (this isn't strictly necessary, but better safe than sorry)
- let actual_parachain_head_hash = parachain_head.hash();
- if parachain_head_hash != actual_parachain_head_hash {
+ // convert from parachain head into stored parachain head data
+ let parachain_head_data =
+ match T::ParaStoredHeaderDataBuilder::try_build(parachain, ¶chain_head) {
+ Some(parachain_head_data) => parachain_head_data,
+ None => {
log::trace!(
target: LOG_TARGET,
- "The submitter has specified invalid parachain {:?} head hash: {:?} vs {:?}",
+ "The head of parachain {:?} has been provided, but it is not tracked by the pallet",
parachain,
- parachain_head_hash,
- actual_parachain_head_hash,
);
- Self::deposit_event(Event::IncorrectParachainHeadHash {
- parachain,
- parachain_head_hash,
- actual_parachain_head_hash,
- });
- continue;
- }
-
- // convert from parachain head into stored parachain head data
- let parachain_head_data = match T::ParaStoredHeaderDataBuilder::try_build(
+ Self::deposit_event(Event::UntrackedParachainRejected { parachain });
+ continue
+ },
+ };
+
+ let update_result: Result<_, ()> =
+ ParasInfo::::try_mutate(parachain, |stored_best_head| {
+ let artifacts = Pallet::::update_parachain_head(
parachain,
- ¶chain_head,
- ) {
- Some(parachain_head_data) => parachain_head_data,
- None => {
- log::trace!(
- target: LOG_TARGET,
- "The head of parachain {:?} has been provided, but it is not tracked by the pallet",
- parachain,
- );
- Self::deposit_event(Event::UntrackedParachainRejected { parachain });
- continue;
- },
- };
-
- let update_result: Result<_, ()> = ParasInfo::::try_mutate(parachain, |stored_best_head| {
- let artifacts = Pallet::::update_parachain_head(
- parachain,
- stored_best_head.take(),
- relay_block_number,
- parachain_head_data,
- parachain_head_hash,
- )?;
- *stored_best_head = Some(artifacts.best_head);
- Ok(artifacts.prune_happened)
- });
-
- // we're refunding weight if update has not happened and if pruning has not happened
- let is_update_happened = matches!(update_result, Ok(_));
- if !is_update_happened {
- actual_weight = actual_weight
- .saturating_sub(WeightInfoOf::::parachain_head_storage_write_weight(T::DbWeight::get()));
- }
- let is_prune_happened = matches!(update_result, Ok(true));
- if !is_prune_happened {
- actual_weight = actual_weight
- .saturating_sub(WeightInfoOf::::parachain_head_pruning_weight(T::DbWeight::get()));
- }
- }
+ stored_best_head.take(),
+ relay_block_number,
+ parachain_head_data,
+ parachain_head_hash,
+ )?;
+ *stored_best_head = Some(artifacts.best_head);
+ Ok(artifacts.prune_happened)
+ });
+
+ // we're refunding weight if update has not happened and if pruning has not happened
+ let is_update_happened = matches!(update_result, Ok(_));
+ if !is_update_happened {
+ actual_weight = actual_weight.saturating_sub(
+ WeightInfoOf::::parachain_head_storage_write_weight(
+ T::DbWeight::get(),
+ ),
+ );
+ }
+ let is_prune_happened = matches!(update_result, Ok(true));
+ if !is_prune_happened {
+ actual_weight = actual_weight.saturating_sub(
+ WeightInfoOf::::parachain_head_pruning_weight(T::DbWeight::get()),
+ );
+ }
+ }
- // even though we may have accepted some parachain heads, we can't allow relayers to submit
- // proof with unused trie nodes
- // => treat this as an error
- //
- // (we can throw error here, because now all our calls are transactional)
- storage.ensure_no_unused_nodes()
- },
- )
- .and_then(|r| r.map_err(HeaderChainError::StorageProof))
- .map_err(|e| {
- log::trace!(target: LOG_TARGET, "Parachain heads storage proof is invalid: {:?}", e);
- Error::::HeaderChain(e)
+ // even though we may have accepted some parachain heads, we can't allow relayers to
+ // submit proof with unused trie nodes
+ // => treat this as an error
+ //
+ // (we can throw error here, because now all our calls are transactional)
+ storage.ensure_no_unused_nodes().map_err(|e| {
+ Error::::HeaderChainStorageProof(HeaderChainError::StorageProof(e))
})?;
Ok(PostDispatchInfo { actual_weight: Some(actual_weight), pays_fee: Pays::Yes })
@@ -614,6 +611,7 @@ pub mod pallet {
}
#[pallet::genesis_config]
+ #[derive(DefaultNoBound)]
pub struct GenesisConfig, I: 'static = ()> {
/// Initial pallet operating mode.
pub operating_mode: BasicOperatingMode,
@@ -623,17 +621,6 @@ pub mod pallet {
pub phantom: sp_std::marker::PhantomData,
}
- #[cfg(feature = "std")]
- impl, I: 'static> Default for GenesisConfig {
- fn default() -> Self {
- Self {
- operating_mode: Default::default(),
- owner: Default::default(),
- phantom: Default::default(),
- }
- }
- }
-
#[pallet::genesis_build]
impl, I: 'static> GenesisBuild for GenesisConfig {
fn build(&self) {
@@ -704,16 +691,17 @@ pub(crate) mod tests {
use crate::mock::{
run_test, test_relay_header, BigParachainHeader, RegularParachainHasher,
RegularParachainHeader, RuntimeEvent as TestEvent, RuntimeOrigin, TestRuntime,
- PARAS_PALLET_NAME, UNTRACKED_PARACHAIN_ID,
+ UNTRACKED_PARACHAIN_ID,
};
+ use bp_test_utils::prepare_parachain_heads_proof;
use codec::Encode;
use bp_parachains::{
BestParaHeadHash, BridgeParachainCall, ImportedParaHeadsKeyProvider, ParasInfoKeyProvider,
};
use bp_runtime::{
- record_all_trie_keys, BasicOperatingMode, OwnedBridgeModuleError,
- StorageDoubleMapKeyProvider, StorageMapKeyProvider,
+ BasicOperatingMode, OwnedBridgeModuleError, StorageDoubleMapKeyProvider,
+ StorageMapKeyProvider,
};
use bp_test_utils::{
authority_list, generate_owned_bridge_module_tests, make_default_justification,
@@ -728,7 +716,6 @@ pub(crate) mod tests {
use frame_system::{EventRecord, Pallet as System, Phase};
use sp_core::Hasher;
use sp_runtime::{traits::Header as HeaderT, DispatchError};
- use sp_trie::{trie_types::TrieDBMutBuilderV1, LayoutV1, MemoryDB, TrieMut};
type BridgesGrandpaPalletInstance = pallet_bridge_grandpa::Instance1;
type WeightInfo = ::WeightInfo;
@@ -771,32 +758,6 @@ pub(crate) mod tests {
hash
}
- pub(crate) fn prepare_parachain_heads_proof(
- heads: Vec<(u32, ParaHead)>,
- ) -> (RelayBlockHash, ParaHeadsProof, Vec<(ParaId, ParaHash)>) {
- let mut parachains = Vec::with_capacity(heads.len());
- let mut root = Default::default();
- let mut mdb = MemoryDB::default();
- {
- let mut trie = TrieDBMutBuilderV1::::new(&mut mdb, &mut root).build();
- for (parachain, head) in heads {
- let storage_key =
- parachain_head_storage_key_at_source(PARAS_PALLET_NAME, ParaId(parachain));
- trie.insert(&storage_key.0, &head.encode())
- .map_err(|_| "TrieMut::insert has failed")
- .expect("TrieMut::insert should not fail in tests");
- parachains.push((ParaId(parachain), head.hash()));
- }
- }
-
- // 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, ParaHeadsProof(storage_proof), parachains)
- }
-
fn initial_best_head(parachain: u32) -> ParaInfo {
ParaInfo {
best_head_hash: BestParaHeadHash {
@@ -878,7 +839,7 @@ pub(crate) mod tests {
#[test]
fn submit_parachain_heads_checks_operating_mode() {
let (state_root, proof, parachains) =
- prepare_parachain_heads_proof(vec![(1, head_data(1, 0))]);
+ prepare_parachain_heads_proof::(vec![(1, head_data(1, 0))]);
run_test(|| {
initialize(state_root);
@@ -909,7 +870,10 @@ pub(crate) mod tests {
#[test]
fn imports_initial_parachain_heads() {
let (state_root, proof, parachains) =
- prepare_parachain_heads_proof(vec![(1, head_data(1, 0)), (3, head_data(3, 10))]);
+ prepare_parachain_heads_proof::(vec![
+ (1, head_data(1, 0)),
+ (3, head_data(3, 10)),
+ ]);
run_test(|| {
initialize(state_root);
@@ -988,9 +952,9 @@ pub(crate) mod tests {
#[test]
fn imports_parachain_heads_is_able_to_progress() {
let (state_root_5, proof_5, parachains_5) =
- prepare_parachain_heads_proof(vec![(1, head_data(1, 5))]);
+ prepare_parachain_heads_proof::(vec![(1, head_data(1, 5))]);
let (state_root_10, proof_10, parachains_10) =
- prepare_parachain_heads_proof(vec![(1, head_data(1, 10))]);
+ prepare_parachain_heads_proof::(vec![(1, head_data(1, 10))]);
run_test(|| {
// start with relay block #0 and import head#5 of parachain#1
initialize(state_root_5);
@@ -1086,11 +1050,12 @@ pub(crate) mod tests {
#[test]
fn ignores_untracked_parachain() {
- let (state_root, proof, parachains) = prepare_parachain_heads_proof(vec![
- (1, head_data(1, 5)),
- (UNTRACKED_PARACHAIN_ID, head_data(1, 5)),
- (2, head_data(1, 5)),
- ]);
+ let (state_root, proof, parachains) =
+ prepare_parachain_heads_proof::(vec![
+ (1, head_data(1, 5)),
+ (UNTRACKED_PARACHAIN_ID, head_data(1, 5)),
+ (2, head_data(1, 5)),
+ ]);
run_test(|| {
// start with relay block #0 and try to import head#5 of parachain#1 and untracked
// parachain
@@ -1163,7 +1128,7 @@ pub(crate) mod tests {
#[test]
fn does_nothing_when_already_imported_this_head_at_previous_relay_header() {
let (state_root, proof, parachains) =
- prepare_parachain_heads_proof(vec![(1, head_data(1, 0))]);
+ prepare_parachain_heads_proof::(vec![(1, head_data(1, 0))]);
run_test(|| {
// import head#0 of parachain#1 at relay block#0
initialize(state_root);
@@ -1223,9 +1188,9 @@ pub(crate) mod tests {
#[test]
fn does_nothing_when_already_imported_head_at_better_relay_header() {
let (state_root_5, proof_5, parachains_5) =
- prepare_parachain_heads_proof(vec![(1, head_data(1, 5))]);
+ prepare_parachain_heads_proof::(vec![(1, head_data(1, 5))]);
let (state_root_10, proof_10, parachains_10) =
- prepare_parachain_heads_proof(vec![(1, head_data(1, 10))]);
+ prepare_parachain_heads_proof::(vec![(1, head_data(1, 10))]);
run_test(|| {
// start with relay block #0
initialize(state_root_5);
@@ -1317,7 +1282,10 @@ pub(crate) mod tests {
#[test]
fn does_nothing_when_parachain_head_is_too_large() {
let (state_root, proof, parachains) =
- prepare_parachain_heads_proof(vec![(1, head_data(1, 5)), (4, big_head_data(1, 5))]);
+ prepare_parachain_heads_proof::(vec![
+ (1, head_data(1, 5)),
+ (4, big_head_data(1, 5)),
+ ]);
run_test(|| {
// start with relay block #0 and try to import head#5 of parachain#1 and big parachain
initialize(state_root);
@@ -1371,8 +1339,9 @@ pub(crate) mod tests {
// import exactly `HeadsToKeep` headers
for i in 0..heads_to_keep {
- let (state_root, proof, parachains) =
- prepare_parachain_heads_proof(vec![(1, head_data(1, i))]);
+ let (state_root, proof, parachains) = prepare_parachain_heads_proof::<
+ RegularParachainHeader,
+ >(vec![(1, head_data(1, i))]);
if i == 0 {
initialize(state_root);
} else {
@@ -1392,8 +1361,9 @@ pub(crate) mod tests {
}
// import next relay chain header and next parachain head
- let (state_root, proof, parachains) =
- prepare_parachain_heads_proof(vec![(1, head_data(1, heads_to_keep))]);
+ let (state_root, proof, parachains) = prepare_parachain_heads_proof::<
+ RegularParachainHeader,
+ >(vec![(1, head_data(1, heads_to_keep))]);
proceed(heads_to_keep, state_root);
let expected_weight = weight_of_import_parachain_1_head(&proof, true);
let result = import_parachain_1_head(heads_to_keep, state_root, parachains, proof);
@@ -1414,7 +1384,7 @@ pub(crate) mod tests {
#[test]
fn fails_on_unknown_relay_chain_block() {
let (state_root, proof, parachains) =
- prepare_parachain_heads_proof(vec![(1, head_data(1, 5))]);
+ prepare_parachain_heads_proof::(vec![(1, head_data(1, 5))]);
run_test(|| {
// start with relay block #0
initialize(state_root);
@@ -1430,7 +1400,7 @@ pub(crate) mod tests {
#[test]
fn fails_on_invalid_storage_proof() {
let (_state_root, proof, parachains) =
- prepare_parachain_heads_proof(vec![(1, head_data(1, 5))]);
+ prepare_parachain_heads_proof::(vec![(1, head_data(1, 5))]);
run_test(|| {
// start with relay block #0
initialize(Default::default());
@@ -1438,7 +1408,7 @@ pub(crate) mod tests {
// try to import head#5 of parachain#1 at relay chain block #0
assert_noop!(
import_parachain_1_head(0, Default::default(), parachains, proof),
- Error::::HeaderChain(HeaderChainError::StorageProof(
+ Error::::HeaderChainStorageProof(HeaderChainError::StorageProof(
StorageProofError::StorageRootMismatch
))
);
@@ -1448,11 +1418,11 @@ pub(crate) mod tests {
#[test]
fn is_not_rewriting_existing_head_if_failed_to_read_updated_head() {
let (state_root_5, proof_5, parachains_5) =
- prepare_parachain_heads_proof(vec![(1, head_data(1, 5))]);
+ prepare_parachain_heads_proof::(vec![(1, head_data(1, 5))]);
let (state_root_10_at_20, proof_10_at_20, parachains_10_at_20) =
- prepare_parachain_heads_proof(vec![(2, head_data(2, 10))]);
+ prepare_parachain_heads_proof::(vec![(2, head_data(2, 10))]);
let (state_root_10_at_30, proof_10_at_30, parachains_10_at_30) =
- prepare_parachain_heads_proof(vec![(1, head_data(1, 10))]);
+ prepare_parachain_heads_proof::(vec![(1, head_data(1, 10))]);
run_test(|| {
// we've already imported head#5 of parachain#1 at relay block#10
initialize(state_root_5);
@@ -1520,7 +1490,8 @@ pub(crate) mod tests {
#[test]
fn ignores_parachain_head_if_it_is_missing_from_storage_proof() {
- let (state_root, proof, _) = prepare_parachain_heads_proof(vec![]);
+ let (state_root, proof, _) =
+ prepare_parachain_heads_proof::(vec![]);
let parachains = vec![(ParaId(2), Default::default())];
run_test(|| {
initialize(state_root);
@@ -1545,7 +1516,8 @@ pub(crate) mod tests {
#[test]
fn ignores_parachain_head_if_parachain_head_hash_is_wrong() {
- let (state_root, proof, _) = prepare_parachain_heads_proof(vec![(1, head_data(1, 0))]);
+ let (state_root, proof, _) =
+ prepare_parachain_heads_proof::