diff --git a/.github/pr-custom-review.yml b/.github/pr-custom-review.yml
index 739f2c82957e..bb715c4adf44 100644
--- a/.github/pr-custom-review.yml
+++ b/.github/pr-custom-review.yml
@@ -6,7 +6,9 @@ action-review-team: ci
rules:
- name: Runtime files
check_type: changed_files
- condition: ^runtime/(kusama|polkadot)/src/[^/]+\.rs$
+ condition:
+ include: ^runtime\/(kusama|polkadot)\/src\/.+\.rs$
+ exclude: ^runtime\/(kusama|polkadot)\/src\/weights\/.+\.rs$
all_distinct:
- min_approvals: 1
teams:
diff --git a/.github/workflows/release-99_bot.yml b/.github/workflows/release-99_bot.yml
index a3180cbebe04..ac01b7e123f4 100644
--- a/.github/workflows/release-99_bot.yml
+++ b/.github/workflows/release-99_bot.yml
@@ -21,9 +21,6 @@ jobs:
- name: '#polkadot-announcements:matrix.parity.io'
room: '!UqHPWiCBGZWxrmYBkF:matrix.parity.io'
pre-release: false
- - name: 'Internal release-notes channel'
- room: '!NTogofoetwjbTwOoPi:matrix.parity.io'
- pre-release: true
- name: 'Ledger <> Polkadot Coordination'
room: '!EoIhaKfGPmFOBrNSHT:web3.foundation'
pre-release: true
@@ -36,5 +33,5 @@ jobs:
with:
room_id: ${{ matrix.channel.room }}
access_token: ${{ secrets.MATRIX_ACCESS_TOKEN }}
- server: "matrix.parity.io"
+ server: "m.parity.io"
message: "***Polkadot ${{github.event.release.tag_name}} has been released!***
${{github.event.release.html_url}}
${{github.event.release.body}}
"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c46f8bf59aaf..52470bc1e7ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,7 @@ variables:
BUILDAH_IMAGE: "quay.io/buildah/stable:v1.27"
DOCKER_OS: "debian:stretch"
ARCH: "x86_64"
- ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.37"
+ ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.43"
default:
cache: {}
diff --git a/Cargo.lock b/Cargo.lock
index 85f446c3d669..84a28e94b6f0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -364,13 +364,13 @@ dependencies = [
[[package]]
name = "async-trait"
-version = "0.1.58"
+version = "0.1.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c"
+checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.13",
]
[[package]]
@@ -383,7 +383,7 @@ dependencies = [
"futures-sink",
"futures-util",
"memchr",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
]
[[package]]
@@ -442,12 +442,6 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
-[[package]]
-name = "base58"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581"
-
[[package]]
name = "base64"
version = "0.13.0"
@@ -472,7 +466,7 @@ dependencies = [
[[package]]
name = "binary-merkle-tree"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"hash-db",
"log",
@@ -1469,13 +1463,14 @@ dependencies = [
[[package]]
name = "curve25519-dalek"
-version = "4.0.0-pre.1"
+version = "4.0.0-rc.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf"
+checksum = "8d4ba9852b42210c7538b75484f9daa0655e9a3ac04f693747bb0f02cf3cfe16"
dependencies = [
- "byteorder",
- "digest 0.9.0",
- "rand_core 0.6.4",
+ "cfg-if",
+ "fiat-crypto",
+ "packed_simd_2",
+ "platforms 3.0.2",
"subtle",
"zeroize",
]
@@ -2250,6 +2245,12 @@ dependencies = [
"subtle",
]
+[[package]]
+name = "fiat-crypto"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
+
[[package]]
name = "file-per-thread-logger"
version = "0.1.4"
@@ -2364,7 +2365,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "fork-tree"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"parity-scale-codec",
]
@@ -2387,7 +2388,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
[[package]]
name = "frame-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-support",
"frame-support-procedural",
@@ -2412,7 +2413,7 @@ dependencies = [
[[package]]
name = "frame-benchmarking-cli"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"Inflector",
"array-bytes",
@@ -2459,7 +2460,7 @@ dependencies = [
[[package]]
name = "frame-election-provider-solution-type"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -2470,7 +2471,7 @@ dependencies = [
[[package]]
name = "frame-election-provider-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-election-provider-solution-type",
"frame-support",
@@ -2487,7 +2488,7 @@ dependencies = [
[[package]]
name = "frame-executive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-support",
"frame-system",
@@ -2516,7 +2517,7 @@ dependencies = [
[[package]]
name = "frame-remote-externalities"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"futures",
"log",
@@ -2532,7 +2533,7 @@ dependencies = [
[[package]]
name = "frame-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"bitflags",
"environmental",
@@ -2565,13 +2566,14 @@ dependencies = [
[[package]]
name = "frame-support-procedural"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"Inflector",
"cfg-expr",
"derive-syn-parse",
"frame-support-procedural-tools",
"itertools",
+ "proc-macro-warning",
"proc-macro2",
"quote",
"syn 1.0.109",
@@ -2580,7 +2582,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate",
@@ -2592,7 +2594,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools-derive"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"proc-macro2",
"quote",
@@ -2602,7 +2604,7 @@ dependencies = [
[[package]]
name = "frame-support-test"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -2626,7 +2628,7 @@ dependencies = [
[[package]]
name = "frame-support-test-pallet"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-support",
"frame-system",
@@ -2637,7 +2639,7 @@ dependencies = [
[[package]]
name = "frame-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-support",
"log",
@@ -2655,7 +2657,7 @@ dependencies = [
[[package]]
name = "frame-system-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -2670,7 +2672,7 @@ dependencies = [
[[package]]
name = "frame-system-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -2679,7 +2681,7 @@ dependencies = [
[[package]]
name = "frame-try-runtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -2729,9 +2731,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
[[package]]
name = "futures"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
dependencies = [
"futures-channel",
"futures-core",
@@ -2744,9 +2746,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
dependencies = [
"futures-core",
"futures-sink",
@@ -2754,15 +2756,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
[[package]]
name = "futures-executor"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
dependencies = [
"futures-core",
"futures-task",
@@ -2772,9 +2774,9 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
[[package]]
name = "futures-lite"
@@ -2787,19 +2789,19 @@ dependencies = [
"futures-io",
"memchr",
"parking",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
"waker-fn",
]
[[package]]
name = "futures-macro"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.13",
]
[[package]]
@@ -2815,15 +2817,15 @@ dependencies = [
[[package]]
name = "futures-sink"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
[[package]]
name = "futures-task"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
[[package]]
name = "futures-timer"
@@ -2833,9 +2835,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
[[package]]
name = "futures-util"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
dependencies = [
"futures-channel",
"futures-core",
@@ -2844,7 +2846,7 @@ dependencies = [
"futures-sink",
"futures-task",
"memchr",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
"pin-utils",
"slab",
]
@@ -2861,7 +2863,7 @@ dependencies = [
[[package]]
name = "generate-bags"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"chrono",
"frame-election-provider-support",
@@ -3215,7 +3217,7 @@ checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
dependencies = [
"bytes",
"http",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
]
[[package]]
@@ -3267,7 +3269,7 @@ dependencies = [
"httparse",
"httpdate",
"itoa",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
"socket2",
"tokio",
"tower-service",
@@ -3864,6 +3866,12 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "libm"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
+
[[package]]
name = "libm"
version = "0.2.1"
@@ -4653,7 +4661,7 @@ dependencies = [
[[package]]
name = "mmr-gadget"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"futures",
"log",
@@ -4672,7 +4680,7 @@ dependencies = [
[[package]]
name = "mmr-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"anyhow",
"jsonrpsee",
@@ -5243,10 +5251,20 @@ dependencies = [
"sha2 0.10.2",
]
+[[package]]
+name = "packed_simd_2"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282"
+dependencies = [
+ "cfg-if",
+ "libm 0.1.4",
+]
+
[[package]]
name = "pallet-assets"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5261,7 +5279,7 @@ dependencies = [
[[package]]
name = "pallet-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-support",
"frame-system",
@@ -5277,7 +5295,7 @@ dependencies = [
[[package]]
name = "pallet-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-support",
"frame-system",
@@ -5291,7 +5309,7 @@ dependencies = [
[[package]]
name = "pallet-babe"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5315,7 +5333,7 @@ dependencies = [
[[package]]
name = "pallet-bags-list"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5335,7 +5353,7 @@ dependencies = [
[[package]]
name = "pallet-bags-list-remote-tests"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-election-provider-support",
"frame-remote-externalities",
@@ -5354,7 +5372,7 @@ dependencies = [
[[package]]
name = "pallet-balances"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5369,7 +5387,7 @@ dependencies = [
[[package]]
name = "pallet-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-support",
"frame-system",
@@ -5388,7 +5406,7 @@ dependencies = [
[[package]]
name = "pallet-beefy-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"array-bytes",
"binary-merkle-tree",
@@ -5412,7 +5430,7 @@ dependencies = [
[[package]]
name = "pallet-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5430,7 +5448,7 @@ dependencies = [
[[package]]
name = "pallet-child-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5449,7 +5467,7 @@ dependencies = [
[[package]]
name = "pallet-collective"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5466,7 +5484,7 @@ dependencies = [
[[package]]
name = "pallet-conviction-voting"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"assert_matches",
"frame-benchmarking",
@@ -5483,7 +5501,7 @@ dependencies = [
[[package]]
name = "pallet-democracy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5501,7 +5519,7 @@ dependencies = [
[[package]]
name = "pallet-election-provider-multi-phase"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5524,7 +5542,7 @@ dependencies = [
[[package]]
name = "pallet-election-provider-support-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5537,7 +5555,7 @@ dependencies = [
[[package]]
name = "pallet-elections-phragmen"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5555,7 +5573,7 @@ dependencies = [
[[package]]
name = "pallet-fast-unstake"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5573,7 +5591,7 @@ dependencies = [
[[package]]
name = "pallet-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5596,7 +5614,7 @@ dependencies = [
[[package]]
name = "pallet-identity"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -5612,7 +5630,7 @@ dependencies = [
[[package]]
name = "pallet-im-online"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5632,7 +5650,7 @@ dependencies = [
[[package]]
name = "pallet-indices"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5649,7 +5667,7 @@ dependencies = [
[[package]]
name = "pallet-membership"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5666,7 +5684,7 @@ dependencies = [
[[package]]
name = "pallet-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5683,7 +5701,7 @@ dependencies = [
[[package]]
name = "pallet-multisig"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5699,7 +5717,7 @@ dependencies = [
[[package]]
name = "pallet-nis"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5715,7 +5733,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools"
version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-support",
"frame-system",
@@ -5732,7 +5750,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools-benchmarking"
version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5752,7 +5770,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools-runtime-api"
version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"pallet-nomination-pools",
"parity-scale-codec",
@@ -5763,7 +5781,7 @@ dependencies = [
[[package]]
name = "pallet-offences"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-support",
"frame-system",
@@ -5780,7 +5798,7 @@ dependencies = [
[[package]]
name = "pallet-offences-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5804,7 +5822,7 @@ dependencies = [
[[package]]
name = "pallet-preimage"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5821,7 +5839,7 @@ dependencies = [
[[package]]
name = "pallet-proxy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5836,7 +5854,7 @@ dependencies = [
[[package]]
name = "pallet-ranked-collective"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5854,7 +5872,7 @@ dependencies = [
[[package]]
name = "pallet-recovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5869,7 +5887,7 @@ dependencies = [
[[package]]
name = "pallet-referenda"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"assert_matches",
"frame-benchmarking",
@@ -5888,7 +5906,7 @@ dependencies = [
[[package]]
name = "pallet-scheduler"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5905,7 +5923,7 @@ dependencies = [
[[package]]
name = "pallet-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-support",
"frame-system",
@@ -5926,7 +5944,7 @@ dependencies = [
[[package]]
name = "pallet-session-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5942,7 +5960,7 @@ dependencies = [
[[package]]
name = "pallet-society"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-support",
"frame-system",
@@ -5956,7 +5974,7 @@ dependencies = [
[[package]]
name = "pallet-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5979,7 +5997,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-curve"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -5990,7 +6008,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-fn"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"log",
"sp-arithmetic",
@@ -5999,7 +6017,7 @@ dependencies = [
[[package]]
name = "pallet-staking-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -6008,7 +6026,7 @@ dependencies = [
[[package]]
name = "pallet-state-trie-migration"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6025,7 +6043,7 @@ dependencies = [
[[package]]
name = "pallet-sudo"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-support",
"frame-system",
@@ -6039,7 +6057,7 @@ dependencies = [
[[package]]
name = "pallet-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6057,7 +6075,7 @@ dependencies = [
[[package]]
name = "pallet-tips"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6076,7 +6094,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-support",
"frame-system",
@@ -6092,7 +6110,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"jsonrpsee",
"pallet-transaction-payment-rpc-runtime-api",
@@ -6108,7 +6126,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"pallet-transaction-payment",
"parity-scale-codec",
@@ -6120,7 +6138,7 @@ dependencies = [
[[package]]
name = "pallet-treasury"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6137,7 +6155,7 @@ dependencies = [
[[package]]
name = "pallet-uniques"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6152,7 +6170,7 @@ dependencies = [
[[package]]
name = "pallet-utility"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6168,7 +6186,7 @@ dependencies = [
[[package]]
name = "pallet-vesting"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6183,7 +6201,7 @@ dependencies = [
[[package]]
name = "pallet-whitelist"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6492,9 +6510,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
[[package]]
name = "pin-project-lite"
-version = "0.2.7"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
[[package]]
name = "pin-utils"
@@ -6534,6 +6552,12 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94"
+[[package]]
+name = "platforms"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630"
+
[[package]]
name = "polkadot"
version = "0.9.39"
@@ -6559,6 +6583,7 @@ dependencies = [
"env_logger 0.9.0",
"futures",
"log",
+ "polkadot-node-jaeger",
"polkadot-node-metrics",
"polkadot-node-network-protocol",
"polkadot-node-primitives",
@@ -7161,6 +7186,7 @@ dependencies = [
"sp-maybe-compressed-blob",
"sp-tracing",
"sp-wasm-interface",
+ "substrate-build-script-utils",
"tempfile",
"test-parachain-adder",
"test-parachain-halt",
@@ -8265,11 +8291,22 @@ dependencies = [
"version_check",
]
+[[package]]
+name = "proc-macro-warning"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d4f284d87b9cedc2ff57223cbc4e3937cd6063c01e92c8e2a8c080df0013933"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
[[package]]
name = "proc-macro2"
-version = "1.0.53"
+version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73"
+checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
dependencies = [
"unicode-ident",
]
@@ -8755,7 +8792,7 @@ dependencies = [
"mime",
"native-tls",
"percent-encoding",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
"serde",
"serde_json",
"serde_urlencoded",
@@ -9135,7 +9172,7 @@ dependencies = [
[[package]]
name = "sc-allocator"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"log",
"sp-core",
@@ -9146,7 +9183,7 @@ dependencies = [
[[package]]
name = "sc-authority-discovery"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"async-trait",
"futures",
@@ -9174,7 +9211,7 @@ dependencies = [
[[package]]
name = "sc-basic-authorship"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"futures",
"futures-timer",
@@ -9197,7 +9234,7 @@ dependencies = [
[[package]]
name = "sc-block-builder"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"parity-scale-codec",
"sc-client-api",
@@ -9212,7 +9249,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"memmap2",
"sc-chain-spec-derive",
@@ -9231,7 +9268,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec-derive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -9242,7 +9279,7 @@ dependencies = [
[[package]]
name = "sc-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"array-bytes",
"chrono",
@@ -9282,7 +9319,7 @@ dependencies = [
[[package]]
name = "sc-client-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"fnv",
"futures",
@@ -9308,7 +9345,7 @@ dependencies = [
[[package]]
name = "sc-client-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"hash-db",
"kvdb",
@@ -9334,7 +9371,7 @@ dependencies = [
[[package]]
name = "sc-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"async-trait",
"futures",
@@ -9359,7 +9396,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"async-trait",
"fork-tree",
@@ -9398,7 +9435,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"futures",
"jsonrpsee",
@@ -9420,7 +9457,7 @@ dependencies = [
[[package]]
name = "sc-consensus-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"array-bytes",
"async-trait",
@@ -9455,7 +9492,7 @@ dependencies = [
[[package]]
name = "sc-consensus-beefy-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"futures",
"jsonrpsee",
@@ -9474,7 +9511,7 @@ dependencies = [
[[package]]
name = "sc-consensus-epochs"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"fork-tree",
"parity-scale-codec",
@@ -9487,7 +9524,7 @@ dependencies = [
[[package]]
name = "sc-consensus-grandpa"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"ahash 0.8.2",
"array-bytes",
@@ -9527,7 +9564,7 @@ dependencies = [
[[package]]
name = "sc-consensus-grandpa-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"finality-grandpa",
"futures",
@@ -9547,7 +9584,7 @@ dependencies = [
[[package]]
name = "sc-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"async-trait",
"futures",
@@ -9570,7 +9607,7 @@ dependencies = [
[[package]]
name = "sc-executor"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"lru 0.8.1",
"parity-scale-codec",
@@ -9594,7 +9631,7 @@ dependencies = [
[[package]]
name = "sc-executor-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"sc-allocator",
"sp-maybe-compressed-blob",
@@ -9607,7 +9644,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmi"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"log",
"sc-allocator",
@@ -9620,7 +9657,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"anyhow",
"cfg-if",
@@ -9638,7 +9675,7 @@ dependencies = [
[[package]]
name = "sc-informant"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"ansi_term",
"futures",
@@ -9654,7 +9691,7 @@ dependencies = [
[[package]]
name = "sc-keystore"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"array-bytes",
"async-trait",
@@ -9669,7 +9706,7 @@ dependencies = [
[[package]]
name = "sc-network"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"array-bytes",
"async-channel",
@@ -9699,6 +9736,7 @@ dependencies = [
"serde",
"serde_json",
"smallvec",
+ "snow",
"sp-arithmetic",
"sp-blockchain",
"sp-consensus",
@@ -9713,7 +9751,7 @@ dependencies = [
[[package]]
name = "sc-network-bitswap"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"cid",
"futures",
@@ -9733,7 +9771,7 @@ dependencies = [
[[package]]
name = "sc-network-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"array-bytes",
"async-trait",
@@ -9761,7 +9799,7 @@ dependencies = [
[[package]]
name = "sc-network-gossip"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"ahash 0.8.2",
"futures",
@@ -9780,7 +9818,7 @@ dependencies = [
[[package]]
name = "sc-network-light"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"array-bytes",
"futures",
@@ -9802,7 +9840,7 @@ dependencies = [
[[package]]
name = "sc-network-sync"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"array-bytes",
"async-trait",
@@ -9836,7 +9874,7 @@ dependencies = [
[[package]]
name = "sc-network-transactions"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"array-bytes",
"futures",
@@ -9856,7 +9894,7 @@ dependencies = [
[[package]]
name = "sc-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"array-bytes",
"bytes",
@@ -9887,7 +9925,7 @@ dependencies = [
[[package]]
name = "sc-peerset"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"futures",
"libp2p",
@@ -9900,7 +9938,7 @@ dependencies = [
[[package]]
name = "sc-proposer-metrics"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"log",
"substrate-prometheus-endpoint",
@@ -9909,7 +9947,7 @@ dependencies = [
[[package]]
name = "sc-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"futures",
"jsonrpsee",
@@ -9939,7 +9977,7 @@ dependencies = [
[[package]]
name = "sc-rpc-api"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
@@ -9958,7 +9996,7 @@ dependencies = [
[[package]]
name = "sc-rpc-server"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"http",
"jsonrpsee",
@@ -9973,7 +10011,7 @@ dependencies = [
[[package]]
name = "sc-rpc-spec-v2"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"array-bytes",
"futures",
@@ -9999,7 +10037,7 @@ dependencies = [
[[package]]
name = "sc-service"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"async-trait",
"directories",
@@ -10065,7 +10103,7 @@ dependencies = [
[[package]]
name = "sc-state-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"log",
"parity-scale-codec",
@@ -10076,7 +10114,7 @@ dependencies = [
[[package]]
name = "sc-storage-monitor"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"clap 4.0.15",
"fs4",
@@ -10092,7 +10130,7 @@ dependencies = [
[[package]]
name = "sc-sync-state-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
@@ -10111,7 +10149,7 @@ dependencies = [
[[package]]
name = "sc-sysinfo"
version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"futures",
"libc",
@@ -10130,7 +10168,7 @@ dependencies = [
[[package]]
name = "sc-telemetry"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"chrono",
"futures",
@@ -10149,7 +10187,7 @@ dependencies = [
[[package]]
name = "sc-tracing"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"ansi_term",
"atty",
@@ -10180,7 +10218,7 @@ dependencies = [
[[package]]
name = "sc-tracing-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -10191,7 +10229,7 @@ dependencies = [
[[package]]
name = "sc-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"async-trait",
"futures",
@@ -10218,7 +10256,7 @@ dependencies = [
[[package]]
name = "sc-transaction-pool-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"async-trait",
"futures",
@@ -10232,7 +10270,7 @@ dependencies = [
[[package]]
name = "sc-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"async-channel",
"futures",
@@ -10246,9 +10284,9 @@ dependencies = [
[[package]]
name = "scale-info"
-version = "2.1.2"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c46be926081c9f4dd5dd9b6f1d3e3229f2360bc6502dd8836f84a93b7c75e99a"
+checksum = "0cfdffd972d76b22f3d7f81c8be34b2296afd3a25e0a547bd9abe340a4dbbe97"
dependencies = [
"bitvec",
"cfg-if",
@@ -10260,9 +10298,9 @@ dependencies = [
[[package]]
name = "scale-info-derive"
-version = "2.1.2"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e334bb10a245e28e5fd755cabcafd96cfcd167c99ae63a46924ca8d8703a3c"
+checksum = "61fa974aea2d63dd18a4ec3a49d59af9f34178c73a4f56d2f18205628d00681e"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -10478,7 +10516,7 @@ checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.8",
+ "syn 2.0.13",
]
[[package]]
@@ -10726,14 +10764,14 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831"
[[package]]
name = "snow"
-version = "0.9.0"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d"
+checksum = "5ccba027ba85743e09d15c03296797cad56395089b832b48b5a5217880f57733"
dependencies = [
"aes-gcm 0.9.4",
"blake2",
"chacha20poly1305",
- "curve25519-dalek 4.0.0-pre.1",
+ "curve25519-dalek 4.0.0-rc.1",
"rand_core 0.6.4",
"ring",
"rustc_version",
@@ -10771,7 +10809,7 @@ dependencies = [
[[package]]
name = "sp-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"hash-db",
"log",
@@ -10789,7 +10827,7 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"Inflector",
"blake2",
@@ -10803,7 +10841,7 @@ dependencies = [
[[package]]
name = "sp-application-crypto"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10816,7 +10854,7 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"integer-sqrt",
"num-traits",
@@ -10830,7 +10868,7 @@ dependencies = [
[[package]]
name = "sp-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10843,7 +10881,7 @@ dependencies = [
[[package]]
name = "sp-block-builder"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -10855,7 +10893,7 @@ dependencies = [
[[package]]
name = "sp-blockchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"futures",
"log",
@@ -10873,7 +10911,7 @@ dependencies = [
[[package]]
name = "sp-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"async-trait",
"futures",
@@ -10888,7 +10926,7 @@ dependencies = [
[[package]]
name = "sp-consensus-aura"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -10906,7 +10944,7 @@ dependencies = [
[[package]]
name = "sp-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"async-trait",
"merlin",
@@ -10929,7 +10967,7 @@ dependencies = [
[[package]]
name = "sp-consensus-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"lazy_static",
"parity-scale-codec",
@@ -10948,7 +10986,7 @@ dependencies = [
[[package]]
name = "sp-consensus-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"finality-grandpa",
"log",
@@ -10966,7 +11004,7 @@ dependencies = [
[[package]]
name = "sp-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10978,7 +11016,7 @@ dependencies = [
[[package]]
name = "sp-consensus-vrf"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10991,13 +11029,13 @@ dependencies = [
[[package]]
name = "sp-core"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"array-bytes",
- "base58",
"bitflags",
"blake2",
"bounded-collections",
+ "bs58",
"dyn-clonable",
"ed25519-zebra",
"futures",
@@ -11034,7 +11072,7 @@ dependencies = [
[[package]]
name = "sp-core-hashing"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"blake2b_simd",
"byteorder",
@@ -11048,7 +11086,7 @@ dependencies = [
[[package]]
name = "sp-core-hashing-proc-macro"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"proc-macro2",
"quote",
@@ -11059,7 +11097,7 @@ dependencies = [
[[package]]
name = "sp-database"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"kvdb",
"parking_lot 0.12.1",
@@ -11068,7 +11106,7 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"proc-macro2",
"quote",
@@ -11078,7 +11116,7 @@ dependencies = [
[[package]]
name = "sp-externalities"
version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -11089,7 +11127,7 @@ dependencies = [
[[package]]
name = "sp-inherents"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"async-trait",
"impl-trait-for-tuples",
@@ -11104,7 +11142,7 @@ dependencies = [
[[package]]
name = "sp-io"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"bytes",
"ed25519",
@@ -11130,7 +11168,7 @@ dependencies = [
[[package]]
name = "sp-keyring"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"lazy_static",
"sp-core",
@@ -11141,7 +11179,7 @@ dependencies = [
[[package]]
name = "sp-keystore"
version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"futures",
"merlin",
@@ -11157,7 +11195,7 @@ dependencies = [
[[package]]
name = "sp-maybe-compressed-blob"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"thiserror",
"zstd",
@@ -11166,7 +11204,7 @@ dependencies = [
[[package]]
name = "sp-mmr-primitives"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"ckb-merkle-mountain-range",
"log",
@@ -11184,7 +11222,7 @@ dependencies = [
[[package]]
name = "sp-npos-elections"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11198,7 +11236,7 @@ dependencies = [
[[package]]
name = "sp-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"sp-api",
"sp-core",
@@ -11208,7 +11246,7 @@ dependencies = [
[[package]]
name = "sp-panic-handler"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"backtrace",
"lazy_static",
@@ -11218,7 +11256,7 @@ dependencies = [
[[package]]
name = "sp-rpc"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"rustc-hash",
"serde",
@@ -11228,7 +11266,7 @@ dependencies = [
[[package]]
name = "sp-runtime"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"either",
"hash256-std-hasher",
@@ -11250,7 +11288,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"bytes",
"impl-trait-for-tuples",
@@ -11268,7 +11306,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"Inflector",
"proc-macro-crate",
@@ -11280,7 +11318,7 @@ dependencies = [
[[package]]
name = "sp-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11294,7 +11332,7 @@ dependencies = [
[[package]]
name = "sp-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11306,7 +11344,7 @@ dependencies = [
[[package]]
name = "sp-state-machine"
version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"hash-db",
"log",
@@ -11326,12 +11364,12 @@ dependencies = [
[[package]]
name = "sp-std"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
[[package]]
name = "sp-storage"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -11344,7 +11382,7 @@ dependencies = [
[[package]]
name = "sp-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"async-trait",
"futures-timer",
@@ -11359,7 +11397,7 @@ dependencies = [
[[package]]
name = "sp-tracing"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"parity-scale-codec",
"sp-std",
@@ -11371,7 +11409,7 @@ dependencies = [
[[package]]
name = "sp-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"sp-api",
"sp-runtime",
@@ -11380,7 +11418,7 @@ dependencies = [
[[package]]
name = "sp-transaction-storage-proof"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"async-trait",
"log",
@@ -11396,7 +11434,7 @@ dependencies = [
[[package]]
name = "sp-trie"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"ahash 0.8.2",
"hash-db",
@@ -11419,7 +11457,7 @@ dependencies = [
[[package]]
name = "sp-version"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -11436,7 +11474,7 @@ dependencies = [
[[package]]
name = "sp-version-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"parity-scale-codec",
"proc-macro2",
@@ -11447,7 +11485,7 @@ dependencies = [
[[package]]
name = "sp-wasm-interface"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"anyhow",
"impl-trait-for-tuples",
@@ -11461,7 +11499,7 @@ dependencies = [
[[package]]
name = "sp-weights"
version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11691,15 +11729,15 @@ dependencies = [
[[package]]
name = "substrate-build-script-utils"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
- "platforms",
+ "platforms 2.0.0",
]
[[package]]
name = "substrate-frame-rpc-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"frame-system-rpc-runtime-api",
"futures",
@@ -11718,7 +11756,7 @@ dependencies = [
[[package]]
name = "substrate-prometheus-endpoint"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"hyper",
"log",
@@ -11730,7 +11768,7 @@ dependencies = [
[[package]]
name = "substrate-rpc-client"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"async-trait",
"jsonrpsee",
@@ -11743,7 +11781,7 @@ dependencies = [
[[package]]
name = "substrate-state-trie-migration-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"jsonrpsee",
"log",
@@ -11762,7 +11800,7 @@ dependencies = [
[[package]]
name = "substrate-test-client"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"array-bytes",
"async-trait",
@@ -11788,7 +11826,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"futures",
"substrate-test-utils-derive",
@@ -11798,7 +11836,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils-derive"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -11809,7 +11847,7 @@ dependencies = [
[[package]]
name = "substrate-wasm-builder"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"ansi_term",
"build-helper",
@@ -11883,9 +11921,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.8"
+version = "2.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9"
+checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"
dependencies = [
"proc-macro2",
"quote",
@@ -12100,7 +12138,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.8",
+ "syn 2.0.13",
]
[[package]]
@@ -12276,7 +12314,7 @@ dependencies = [
"mio",
"num_cpus",
"parking_lot 0.12.1",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
"signal-hook-registry",
"socket2",
"tokio-macros",
@@ -12322,7 +12360,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9"
dependencies = [
"futures-core",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
"tokio",
"tokio-util 0.7.1",
]
@@ -12349,7 +12387,7 @@ dependencies = [
"futures-core",
"futures-sink",
"log",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
"tokio",
]
@@ -12363,7 +12401,7 @@ dependencies = [
"futures-core",
"futures-io",
"futures-sink",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
"tokio",
]
@@ -12417,7 +12455,7 @@ dependencies = [
"http",
"http-body",
"http-range-header",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
"tower-layer",
"tower-service",
]
@@ -12436,22 +12474,22 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
[[package]]
name = "tracing"
-version = "0.1.35"
+version = "0.1.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
dependencies = [
"cfg-if",
"log",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
"tracing-attributes",
"tracing-core",
]
[[package]]
name = "tracing-attributes"
-version = "0.1.20"
+version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b"
+checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
dependencies = [
"proc-macro2",
"quote",
@@ -12460,9 +12498,9 @@ dependencies = [
[[package]]
name = "tracing-core"
-version = "0.1.28"
+version = "0.1.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7"
+checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
dependencies = [
"once_cell",
"valuable",
@@ -12639,7 +12677,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
[[package]]
name = "try-runtime-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#f40ba0d09785159a31a43b16b47ddb5ae8e62e1d"
+source = "git+https://github.com/paritytech/substrate?branch=master#7bbfe737a180e548ace7e819099dcb62cf48fa11"
dependencies = [
"async-trait",
"clap 4.0.15",
@@ -13123,7 +13161,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7"
dependencies = [
"downcast-rs",
- "libm",
+ "libm 0.2.1",
"memory_units",
"num-rational",
"num-traits",
diff --git a/cli/build.rs b/cli/build.rs
index 6eda5fb94338..018ea752a009 100644
--- a/cli/build.rs
+++ b/cli/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/cli/src/cli.rs b/cli/src/cli.rs
index 37083eb91278..b775bb6b77ad 100644
--- a/cli/src/cli.rs
+++ b/cli/src/cli.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
@@ -79,7 +79,11 @@ pub enum Subcommand {
#[derive(Debug, Parser)]
pub struct ValidationWorkerCommand {
/// The path to the validation host's socket.
+ #[arg(long)]
pub socket_path: String,
+ /// Calling node implementation version
+ #[arg(long)]
+ pub node_impl_version: String,
}
#[allow(missing_docs)]
diff --git a/cli/src/command.rs b/cli/src/command.rs
index 0d1a3f81639a..2f0bc9e2f856 100644
--- a/cli/src/command.rs
+++ b/cli/src/command.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
@@ -494,7 +494,10 @@ pub fn run() -> Result<()> {
#[cfg(not(target_os = "android"))]
{
- polkadot_node_core_pvf::prepare_worker_entrypoint(&cmd.socket_path);
+ polkadot_node_core_pvf::prepare_worker_entrypoint(
+ &cmd.socket_path,
+ Some(&cmd.node_impl_version),
+ );
Ok(())
}
},
@@ -513,7 +516,10 @@ pub fn run() -> Result<()> {
#[cfg(not(target_os = "android"))]
{
- polkadot_node_core_pvf::execute_worker_entrypoint(&cmd.socket_path);
+ polkadot_node_core_pvf::execute_worker_entrypoint(
+ &cmd.socket_path,
+ Some(&cmd.node_impl_version),
+ );
Ok(())
}
},
diff --git a/cli/src/error.rs b/cli/src/error.rs
index e125998c476f..a4591e2508c9 100644
--- a/cli/src/error.rs
+++ b/cli/src/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/cli/src/host_perf_check.rs b/cli/src/host_perf_check.rs
index 722deab7450b..1225c4708a3a 100644
--- a/cli/src/host_perf_check.rs
+++ b/cli/src/host_perf_check.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/cli/src/lib.rs b/cli/src/lib.rs
index b31cf5dca8dc..8a859c1b2bd2 100644
--- a/cli/src/lib.rs
+++ b/cli/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/core-primitives/Cargo.toml b/core-primitives/Cargo.toml
index 7ebc8b389c9c..56dca0535eed 100644
--- a/core-primitives/Cargo.toml
+++ b/core-primitives/Cargo.toml
@@ -8,7 +8,7 @@ edition.workspace = true
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
+scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
parity-scale-codec = { version = "3.4.0", default-features = false, features = [ "derive" ] }
[features]
diff --git a/core-primitives/src/lib.rs b/core-primitives/src/lib.rs
index ca4d2372db38..5e06966ecfee 100644
--- a/core-primitives/src/lib.rs
+++ b/core-primitives/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/erasure-coding/benches/scaling_with_validators.rs b/erasure-coding/benches/scaling_with_validators.rs
index 35eff095d2f6..759385bbdef4 100644
--- a/erasure-coding/benches/scaling_with_validators.rs
+++ b/erasure-coding/benches/scaling_with_validators.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/erasure-coding/fuzzer/src/reconstruct.rs b/erasure-coding/fuzzer/src/reconstruct.rs
index a388a55857d7..f6a95a9d3e9a 100644
--- a/erasure-coding/fuzzer/src/reconstruct.rs
+++ b/erasure-coding/fuzzer/src/reconstruct.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/erasure-coding/fuzzer/src/round_trip.rs b/erasure-coding/fuzzer/src/round_trip.rs
index 0d4507c98e65..e1be4c49e205 100644
--- a/erasure-coding/fuzzer/src/round_trip.rs
+++ b/erasure-coding/fuzzer/src/round_trip.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/erasure-coding/src/lib.rs b/erasure-coding/src/lib.rs
index 50c9ca64e0df..36847b463715 100644
--- a/erasure-coding/src/lib.rs
+++ b/erasure-coding/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2018-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/file_header.txt b/file_header.txt
index bae07bb7eccc..47483d33a42a 100644
--- a/file_header.txt
+++ b/file_header.txt
@@ -1,4 +1,4 @@
-// Copyright 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
@@ -12,4 +12,4 @@
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
-// along with Polkadot. If not, see .
\ No newline at end of file
+// along with Polkadot. If not, see .
diff --git a/node/client/src/benchmarking.rs b/node/client/src/benchmarking.rs
index 7ed9bcee5041..69927c11a913 100644
--- a/node/client/src/benchmarking.rs
+++ b/node/client/src/benchmarking.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/client/src/lib.rs b/node/client/src/lib.rs
index 466bfef61efa..1ef0e7f6c022 100644
--- a/node/client/src/lib.rs
+++ b/node/client/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/collation-generation/src/error.rs b/node/collation-generation/src/error.rs
index 44b08c473f83..ac5db6cd7f28 100644
--- a/node/collation-generation/src/error.rs
+++ b/node/collation-generation/src/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/collation-generation/src/lib.rs b/node/collation-generation/src/lib.rs
index b3d728f70a48..79ef490f505c 100644
--- a/node/collation-generation/src/lib.rs
+++ b/node/collation-generation/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/collation-generation/src/metrics.rs b/node/collation-generation/src/metrics.rs
index 008d8be0adcc..cb9e4a0c8e85 100644
--- a/node/collation-generation/src/metrics.rs
+++ b/node/collation-generation/src/metrics.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/collation-generation/src/tests.rs b/node/collation-generation/src/tests.rs
index 9640f07b80e2..b2534bcf36c1 100644
--- a/node/collation-generation/src/tests.rs
+++ b/node/collation-generation/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/approval-voting/src/approval_checking.rs b/node/core/approval-voting/src/approval_checking.rs
index aba03ed1ce30..bfecdba73f88 100644
--- a/node/core/approval-voting/src/approval_checking.rs
+++ b/node/core/approval-voting/src/approval_checking.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/approval-voting/src/approval_db/mod.rs b/node/core/approval-voting/src/approval_db/mod.rs
index 8ea9b80e6095..f0ace95613da 100644
--- a/node/core/approval-voting/src/approval_db/mod.rs
+++ b/node/core/approval-voting/src/approval_db/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/approval-voting/src/approval_db/v1/mod.rs b/node/core/approval-voting/src/approval_db/v1/mod.rs
index a761b7f20e84..d2a13ad54550 100644
--- a/node/core/approval-voting/src/approval_db/v1/mod.rs
+++ b/node/core/approval-voting/src/approval_db/v1/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/approval-voting/src/approval_db/v1/tests.rs b/node/core/approval-voting/src/approval_db/v1/tests.rs
index 5b6602882e59..0d30cc8c0cdc 100644
--- a/node/core/approval-voting/src/approval_db/v1/tests.rs
+++ b/node/core/approval-voting/src/approval_db/v1/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
@@ -401,7 +401,7 @@ fn canonicalize_works() {
assert_eq!(entry.candidates.len(), with_candidates.len());
for x in with_candidates {
- assert!(entry.candidates.iter().position(|&(_, ref c)| c == &x).is_some());
+ assert!(entry.candidates.iter().any(|(_, c)| c == &x));
}
}
};
diff --git a/node/core/approval-voting/src/backend.rs b/node/core/approval-voting/src/backend.rs
index 3fb90fabe574..87d67c52c467 100644
--- a/node/core/approval-voting/src/backend.rs
+++ b/node/core/approval-voting/src/backend.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/approval-voting/src/criteria.rs b/node/core/approval-voting/src/criteria.rs
index 3b76941fde40..e8690895217a 100644
--- a/node/core/approval-voting/src/criteria.rs
+++ b/node/core/approval-voting/src/criteria.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
@@ -274,7 +274,7 @@ pub(crate) fn compute_assignments(
// Ignore any cores where the assigned group is our own.
let leaving_cores = leaving_cores
.into_iter()
- .filter(|&(_, _, ref g)| !is_in_backing_group(&config.validator_groups, index, *g))
+ .filter(|(_, _, g)| !is_in_backing_group(&config.validator_groups, index, *g))
.map(|(c_hash, core, _)| (c_hash, core))
.collect::>();
@@ -496,7 +496,7 @@ pub(crate) fn check_assignment_cert(
return Err(InvalidAssignment(Reason::IsInBackingGroup))
}
- let &(ref vrf_output, ref vrf_proof) = &assignment.vrf;
+ let (vrf_output, vrf_proof) = &assignment.vrf;
match assignment.kind {
AssignmentCertKind::RelayVRFModulo { sample } => {
if sample >= config.relay_vrf_modulo_samples {
diff --git a/node/core/approval-voting/src/import.rs b/node/core/approval-voting/src/import.rs
index f36b79c7a4e1..ebe300bc26ea 100644
--- a/node/core/approval-voting/src/import.rs
+++ b/node/core/approval-voting/src/import.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
@@ -329,13 +329,17 @@ pub(crate) async fn handle_new_head(
finalized_number: &Option,
) -> SubsystemResult> {
const MAX_HEADS_LOOK_BACK: BlockNumber = MAX_FINALITY_LAG;
-
- let mut span = jaeger::Span::new(head, "approval-checking-import");
+ let _handle_new_head_span = state
+ .spans
+ .get(&head)
+ .map(|span| span.child("handle-new-head"))
+ .unwrap_or_else(|| jaeger::Span::new(head, "handle-new-head"))
+ .with_string_tag("head", format!("{:?}", head))
+ .with_stage(jaeger::Stage::ApprovalChecking);
let header = {
let (h_tx, h_rx) = oneshot::channel();
ctx.send_message(ChainApiMessage::BlockHeader(head, h_tx)).await;
-
match h_rx.await? {
Err(e) => {
gum::debug!(
@@ -343,11 +347,12 @@ pub(crate) async fn handle_new_head(
"Chain API subsystem temporarily unreachable {}",
e,
);
-
+ // May be a better way of handling errors here.
return Ok(Vec::new())
},
Ok(None) => {
gum::warn!(target: LOG_TARGET, "Missing header for new head {}", head);
+ // May be a better way of handling warnings here.
return Ok(Vec::new())
},
Ok(Some(h)) => h,
@@ -363,7 +368,6 @@ pub(crate) async fn handle_new_head(
?e,
"Could not cache session info when processing head.",
);
-
return Ok(Vec::new())
},
Ok(Some(a @ SessionWindowUpdate::Advanced { .. })) => {
@@ -391,8 +395,6 @@ pub(crate) async fn handle_new_head(
.map_err(|e| SubsystemError::with_origin("approval-voting", e))
.await?;
- span.add_uint_tag("new-blocks", new_blocks.len() as u64);
-
if new_blocks.is_empty() {
return Ok(Vec::new())
}
@@ -473,6 +475,7 @@ pub(crate) async fn handle_new_head(
);
(block_tick, no_show_duration)
};
+
let needed_approvals = session_info.needed_approvals;
let validator_group_lens: Vec =
session_info.validator_groups.iter().map(|v| v.len()).collect();
@@ -507,11 +510,9 @@ pub(crate) async fn handle_new_head(
result.len(),
);
}
-
result
}
};
-
// If all bits are already set, then send an approve message.
if approved_bitfield.count_ones() == approved_bitfield.len() {
ctx.send_message(ChainSelectionMessage::Approved(block_hash)).await;
@@ -602,7 +603,6 @@ pub(crate) async fn handle_new_head(
);
ctx.send_unbounded_message(ApprovalDistributionMessage::NewBlocks(approval_meta));
-
Ok(imported_candidates)
}
@@ -661,6 +661,7 @@ pub(crate) mod tests {
assignment_criteria: Box::new(MockAssignmentCriteria),
db,
db_config: TEST_CONFIG,
+ spans: HashMap::new(),
}
}
@@ -1226,7 +1227,7 @@ pub(crate) mod tests {
let mut state = single_session_state(session, session_info);
overlay_db.write_block_entry(
v1::BlockEntry {
- block_hash: parent_hash.clone(),
+ block_hash: parent_hash,
parent_hash: Default::default(),
block_number: 4,
session,
diff --git a/node/core/approval-voting/src/lib.rs b/node/core/approval-voting/src/lib.rs
index 59db8732a429..6a7ae10bfa2a 100644
--- a/node/core/approval-voting/src/lib.rs
+++ b/node/core/approval-voting/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
@@ -21,6 +21,7 @@
//! of others. It uses this information to determine when candidates and blocks have
//! been sufficiently approved to finalize.
+use jaeger::{hash_to_trace_identifier, PerLeafSpan};
use polkadot_node_jaeger as jaeger;
use polkadot_node_primitives::{
approval::{
@@ -478,7 +479,11 @@ impl Wakeups {
self.wakeups.entry(tick).or_default().push((block_hash, candidate_hash));
}
- fn prune_finalized_wakeups(&mut self, finalized_number: BlockNumber) {
+ fn prune_finalized_wakeups(
+ &mut self,
+ finalized_number: BlockNumber,
+ spans: &mut HashMap,
+ ) {
let after = self.block_numbers.split_off(&(finalized_number + 1));
let pruned_blocks: HashSet<_> = std::mem::replace(&mut self.block_numbers, after)
.into_iter()
@@ -486,7 +491,7 @@ impl Wakeups {
.collect();
let mut pruned_wakeups = BTreeMap::new();
- self.reverse_wakeups.retain(|&(ref h, ref c_h), tick| {
+ self.reverse_wakeups.retain(|(h, c_h), tick| {
let live = !pruned_blocks.contains(h);
if !live {
pruned_wakeups.entry(*tick).or_insert_with(HashSet::new).insert((*h, *c_h));
@@ -502,6 +507,9 @@ impl Wakeups {
}
}
}
+
+ // Remove all spans that are associated with pruned blocks.
+ spans.retain(|h, _| !pruned_blocks.contains(h));
}
// Get the wakeup for a particular block/candidate combo, if any.
@@ -639,6 +647,7 @@ struct State {
// Require for `RollingSessionWindow`.
db_config: DatabaseConfig,
db: Arc,
+ spans: HashMap,
}
#[overseer::contextbounds(ApprovalVoting, prefix = self::overseer)]
@@ -777,6 +786,7 @@ where
assignment_criteria,
db_config: subsystem.db_config,
db: subsystem.db,
+ spans: HashMap::new(),
};
let mut wakeups = Wakeups::default();
@@ -798,14 +808,13 @@ where
loop {
let mut overlayed_db = OverlayedBackend::new(&backend);
let actions = futures::select! {
- (tick, woken_block, woken_candidate) = wakeups.next(&*state.clock).fuse() => {
+ (_tick, woken_block, woken_candidate) = wakeups.next(&*state.clock).fuse() => {
subsystem.metrics.on_wakeup();
process_wakeup(
&mut state,
&mut overlayed_db,
woken_block,
woken_candidate,
- tick,
&subsystem.metrics,
)?
}
@@ -878,7 +887,6 @@ where
if !overlayed_db.is_empty() {
let _timer = subsystem.metrics.time_db_transaction();
-
let ops = overlayed_db.into_write_ops();
backend.write(ops)?;
}
@@ -919,12 +927,12 @@ async fn handle_actions(
actions: Vec,
) -> SubsystemResult {
let mut conclude = false;
-
let mut actions_iter = actions.into_iter();
while let Some(action) = actions_iter.next() {
match action {
- Action::ScheduleWakeup { block_hash, block_number, candidate_hash, tick } =>
- wakeups.schedule(block_hash, block_number, candidate_hash, tick),
+ Action::ScheduleWakeup { block_hash, block_number, candidate_hash, tick } => {
+ wakeups.schedule(block_hash, block_number, candidate_hash, tick);
+ },
Action::IssueApproval(candidate_hash, approval_request) => {
// Note that the IssueApproval action will create additional
// actions that will need to all be processed before we can
@@ -968,8 +976,18 @@ async fn handle_actions(
continue
}
+ let mut launch_approval_span = state
+ .spans
+ .get(&relay_block_hash)
+ .map(|span| span.child("launch-approval"))
+ .unwrap_or_else(|| jaeger::Span::new(candidate_hash, "launch-approval"))
+ .with_trace_id(candidate_hash)
+ .with_candidate(candidate_hash)
+ .with_stage(jaeger::Stage::ApprovalChecking);
+
metrics.on_assignment_produced(assignment_tranche);
let block_hash = indirect_cert.block_hash;
+ launch_approval_span.add_string_tag("block-hash", format!("{:?}", block_hash));
let validator_index = indirect_cert.validator;
ctx.send_unbounded_message(ApprovalDistributionMessage::DistributeAssignment(
@@ -1004,6 +1022,7 @@ async fn handle_actions(
validator_index,
block_hash,
backing_group,
+ &launch_approval_span,
)
.await
},
@@ -1014,12 +1033,21 @@ async fn handle_actions(
}
},
Action::NoteApprovedInChainSelection(block_hash) => {
+ let _span = state
+ .spans
+ .get(&block_hash)
+ .map(|span| span.child("note-approved-in-chain-selection"))
+ .unwrap_or_else(|| {
+ jaeger::Span::new(block_hash, "note-approved-in-chain-selection")
+ })
+ .with_string_tag("block-hash", format!("{:?}", block_hash))
+ .with_stage(jaeger::Stage::ApprovalChecking);
ctx.send_message(ChainSelectionMessage::Approved(block_hash)).await;
},
Action::BecomeActive => {
*mode = Mode::Active;
- let messages = distribution_messages_for_activation(overlayed_db)?;
+ let messages = distribution_messages_for_activation(overlayed_db, state)?;
ctx.send_messages(messages.into_iter()).await;
},
@@ -1034,6 +1062,7 @@ async fn handle_actions(
fn distribution_messages_for_activation(
db: &OverlayedBackend<'_, impl Backend>,
+ state: &mut State,
) -> SubsystemResult> {
let all_blocks: Vec = db.load_all_blocks()?;
@@ -1043,6 +1072,15 @@ fn distribution_messages_for_activation(
messages.push(ApprovalDistributionMessage::NewBlocks(Vec::new())); // dummy value.
for block_hash in all_blocks {
+ let mut distribution_message_span = state
+ .spans
+ .get(&block_hash)
+ .map(|span| span.child("distribution-messages-for-activation"))
+ .unwrap_or_else(|| {
+ jaeger::Span::new(block_hash, "distribution-messages-for-activation")
+ })
+ .with_stage(jaeger::Stage::ApprovalChecking)
+ .with_string_tag("block-hash", format!("{:?}", block_hash));
let block_entry = match db.load_block_entry(&block_hash)? {
Some(b) => b,
None => {
@@ -1051,6 +1089,10 @@ fn distribution_messages_for_activation(
continue
},
};
+
+ distribution_message_span.add_string_tag("block-hash", &block_hash.to_string());
+ distribution_message_span
+ .add_string_tag("parent-hash", &block_entry.parent_hash().to_string());
approval_meta.push(BlockApprovalMeta {
hash: block_hash,
number: block_entry.block_number(),
@@ -1061,6 +1103,8 @@ fn distribution_messages_for_activation(
});
for (i, (_, candidate_hash)) in block_entry.candidates().iter().enumerate() {
+ let _candidate_span =
+ distribution_message_span.child("candidate").with_candidate(*candidate_hash);
let candidate_entry = match db.load_candidate_entry(&candidate_hash)? {
Some(c) => c,
None => {
@@ -1140,9 +1184,11 @@ async fn handle_from_overseer(
let actions = match x {
FromOrchestra::Signal(OverseerSignal::ActiveLeaves(update)) => {
let mut actions = Vec::new();
-
if let Some(activated) = update.activated {
let head = activated.hash;
+ let approval_voting_span =
+ jaeger::PerLeafSpan::new(activated.span, "approval-voting");
+ state.spans.insert(head, approval_voting_span);
match import::handle_new_head(ctx, state, db, head, &*last_finalized_height).await {
Err(e) => return Err(SubsystemError::with_origin("db", e)),
Ok(block_imported_candidates) => {
@@ -1199,7 +1245,12 @@ async fn handle_from_overseer(
crate::ops::canonicalize(db, block_number, block_hash)
.map_err(|e| SubsystemError::with_origin("db", e))?;
- wakeups.prune_finalized_wakeups(block_number);
+ // `prune_finalized_wakeups` prunes all finalized block hashes. We prune spans accordingly.
+ wakeups.prune_finalized_wakeups(block_number, &mut state.spans);
+
+ // // `prune_finalized_wakeups` prunes all finalized block hashes. We prune spans accordingly.
+ // let hash_set = wakeups.block_numbers.values().flatten().collect::>();
+ // state.spans.retain(|hash, _| hash_set.contains(hash));
Vec::new()
},
@@ -1220,7 +1271,23 @@ async fn handle_from_overseer(
})?
.0,
ApprovalVotingMessage::ApprovedAncestor(target, lower_bound, res) => {
- match handle_approved_ancestor(ctx, db, target, lower_bound, wakeups).await {
+ let mut approved_ancestor_span = state
+ .spans
+ .get(&target)
+ .map(|span| span.child("approved-ancestor"))
+ .unwrap_or_else(|| jaeger::Span::new(target, "approved-ancestor"))
+ .with_stage(jaeger::Stage::ApprovalChecking)
+ .with_string_tag("leaf", format!("{:?}", target));
+ match handle_approved_ancestor(
+ ctx,
+ db,
+ target,
+ lower_bound,
+ wakeups,
+ &mut approved_ancestor_span,
+ )
+ .await
+ {
Ok(v) => {
let _ = res.send(v);
},
@@ -1342,15 +1409,15 @@ async fn handle_approved_ancestor(
target: Hash,
lower_bound: BlockNumber,
wakeups: &Wakeups,
+ span: &mut jaeger::Span,
) -> SubsystemResult> {
const MAX_TRACING_WINDOW: usize = 200;
const ABNORMAL_DEPTH_THRESHOLD: usize = 5;
-
+ let mut span = span
+ .child("handle-approved-ancestor")
+ .with_stage(jaeger::Stage::ApprovalChecking);
use bitvec::{order::Lsb0, vec::BitVec};
- let mut span =
- jaeger::Span::new(&target, "approved-ancestor").with_stage(jaeger::Stage::ApprovalChecking);
-
let mut all_approved_max = None;
let target_number = {
@@ -1365,13 +1432,12 @@ async fn handle_approved_ancestor(
}
};
+ span.add_uint_tag("leaf-number", target_number as u64);
+ span.add_uint_tag("lower-bound", lower_bound as u64);
if target_number <= lower_bound {
return Ok(None)
}
- span.add_string_fmt_debug_tag("target-number", target_number);
- span.add_string_fmt_debug_tag("target-hash", target);
-
// request ancestors up to but not including the lower bound,
// as a vote on the lower bound is implied if we cannot find
// anything else.
@@ -1397,6 +1463,9 @@ async fn handle_approved_ancestor(
let mut bits: BitVec = Default::default();
for (i, block_hash) in std::iter::once(target).chain(ancestry).enumerate() {
+ let mut entry_span =
+ span.child("load-block-entry").with_stage(jaeger::Stage::ApprovalChecking);
+ entry_span.add_string_tag("block-hash", format!("{:?}", block_hash));
// Block entries should be present as the assumption is that
// nothing here is finalized. If we encounter any missing block
// entries we can fail.
@@ -1452,7 +1521,7 @@ async fn handle_approved_ancestor(
unapproved.len(),
entry.candidates().len(),
);
-
+ entry_span.add_uint_tag("unapproved-candidates", unapproved.len() as u64);
for candidate_hash in unapproved {
match db.load_candidate_entry(&candidate_hash)? {
None => {
@@ -1575,8 +1644,8 @@ async fn handle_approved_ancestor(
});
match all_approved_max {
Some(HighestApprovedAncestorBlock { ref hash, ref number, .. }) => {
- span.add_uint_tag("approved-number", *number as u64);
- span.add_string_fmt_debug_tag("approved-hash", hash);
+ span.add_uint_tag("highest-approved-number", *number as u64);
+ span.add_string_fmt_debug_tag("highest-approved-hash", hash);
},
None => {
span.add_string_tag("reached-lower-bound", "true");
@@ -1677,6 +1746,15 @@ fn check_and_import_assignment(
) -> SubsystemResult<(AssignmentCheckResult, Vec)> {
let tick_now = state.clock.tick_now();
+ let mut check_and_import_assignment_span = state
+ .spans
+ .get(&assignment.block_hash)
+ .map(|span| span.child("check-and-import-assignment"))
+ .unwrap_or_else(|| jaeger::Span::new(assignment.block_hash, "check-and-import-assignment"))
+ .with_relay_parent(assignment.block_hash)
+ .with_uint_tag("candidate-index", candidate_index as u64)
+ .with_stage(jaeger::Stage::ApprovalChecking);
+
let block_entry = match db.load_block_entry(&assignment.block_hash)? {
Some(b) => b,
None =>
@@ -1711,6 +1789,13 @@ fn check_and_import_assignment(
)), // no candidate at core.
};
+ check_and_import_assignment_span
+ .add_string_tag("candidate-hash", format!("{:?}", assigned_candidate_hash));
+ check_and_import_assignment_span.add_string_tag(
+ "traceID",
+ format!("{:?}", jaeger::hash_to_trace_identifier(assigned_candidate_hash.0)),
+ );
+
let mut candidate_entry = match db.load_candidate_entry(&assigned_candidate_hash)? {
Some(c) => c,
None =>
@@ -1769,6 +1854,8 @@ fn check_and_import_assignment(
},
};
+ check_and_import_assignment_span.add_uint_tag("tranche", tranche as u64);
+
let is_duplicate = approval_entry.is_assigned(assignment.validator);
approval_entry.import_assignment(tranche, assignment.validator, tick_now);
@@ -1822,6 +1909,15 @@ fn check_and_import_approval(
}};
}
+ let mut span = state
+ .spans
+ .get(&approval.block_hash)
+ .map(|span| span.child("check-and-import-approval"))
+ .unwrap_or_else(|| jaeger::Span::new(approval.block_hash, "check-and-import-approval"))
+ .with_uint_tag("candidate-index", approval.candidate_index as u64)
+ .with_relay_parent(approval.block_hash)
+ .with_stage(jaeger::Stage::ApprovalChecking);
+
let block_entry = match db.load_block_entry(&approval.block_hash)? {
Some(b) => b,
None => {
@@ -1847,6 +1943,12 @@ fn check_and_import_approval(
)),
};
+ span.add_string_tag("candidate-hash", format!("{:?}", approved_candidate_hash));
+ span.add_string_tag(
+ "traceID",
+ format!("{:?}", hash_to_trace_identifier(approved_candidate_hash.0)),
+ );
+
let pubkey = match session_info.validators.get(approval.validator) {
Some(k) => k,
None => respond_early!(ApprovalCheckResult::Bad(
@@ -2120,16 +2222,17 @@ fn process_wakeup(
db: &mut OverlayedBackend<'_, impl Backend>,
relay_block: Hash,
candidate_hash: CandidateHash,
- expected_tick: Tick,
metrics: &Metrics,
) -> SubsystemResult> {
- let _span = jaeger::Span::from_encodable(
- (relay_block, candidate_hash, expected_tick),
- "process-approval-wakeup",
- )
- .with_relay_parent(relay_block)
- .with_candidate(candidate_hash)
- .with_stage(jaeger::Stage::ApprovalChecking);
+ let mut span = state
+ .spans
+ .get(&relay_block)
+ .map(|span| span.child("process-wakeup"))
+ .unwrap_or_else(|| jaeger::Span::new(candidate_hash, "process-wakeup"))
+ .with_trace_id(candidate_hash)
+ .with_relay_parent(relay_block)
+ .with_candidate(candidate_hash)
+ .with_stage(jaeger::Stage::ApprovalChecking);
let block_entry = db.load_block_entry(&relay_block)?;
let candidate_entry = db.load_candidate_entry(&candidate_hash)?;
@@ -2159,9 +2262,8 @@ fn process_wakeup(
state.slot_duration_millis,
Slot::from(u64::from(session_info.no_show_slots)),
);
-
let tranche_now = state.clock.tranche_now(state.slot_duration_millis, block_entry.slot());
-
+ span.add_uint_tag("tranche", tranche_now as u64);
gum::trace!(
target: LOG_TARGET,
tranche = tranche_now,
@@ -2195,6 +2297,8 @@ fn process_wakeup(
(should_trigger, approval_entry.backing_group())
};
+ gum::trace!(target: LOG_TARGET, "Wakeup processed. Should trigger: {}", should_trigger);
+
let mut actions = Vec::new();
let candidate_receipt = candidate_entry.candidate_receipt().clone();
@@ -2243,7 +2347,6 @@ fn process_wakeup(
});
}
}
-
// Although we checked approval earlier in this function,
// this wakeup might have advanced the state to approved via
// a no-show that was immediately covered and therefore
@@ -2275,6 +2378,7 @@ async fn launch_approval(
validator_index: ValidatorIndex,
block_hash: Hash,
backing_group: GroupIndex,
+ span: &jaeger::Span,
) -> SubsystemResult> {
let (a_tx, a_rx) = oneshot::channel();
let (code_tx, code_rx) = oneshot::channel();
@@ -2306,9 +2410,15 @@ async fn launch_approval(
let candidate_hash = candidate.hash();
let para_id = candidate.descriptor.para_id;
-
gum::trace!(target: LOG_TARGET, ?candidate_hash, ?para_id, "Recovering data.");
+ let request_validation_data_span = span
+ .child("request-validation-data")
+ .with_trace_id(candidate_hash)
+ .with_candidate(candidate_hash)
+ .with_string_tag("block-hash", format!("{:?}", block_hash))
+ .with_stage(jaeger::Stage::ApprovalChecking);
+
let timer = metrics.time_recover_and_approve();
ctx.send_message(AvailabilityRecoveryMessage::RecoverAvailableData(
candidate.clone(),
@@ -2318,6 +2428,13 @@ async fn launch_approval(
))
.await;
+ let request_validation_result_span = span
+ .child("request-validation-result")
+ .with_trace_id(candidate_hash)
+ .with_candidate(candidate_hash)
+ .with_string_tag("block-hash", format!("{:?}", block_hash))
+ .with_stage(jaeger::Stage::ApprovalChecking);
+
ctx.send_message(RuntimeApiMessage::Request(
block_hash,
RuntimeApiRequest::ValidationCodeByHash(candidate.descriptor.validation_code_hash, code_tx),
@@ -2330,10 +2447,6 @@ async fn launch_approval(
let background = async move {
// Force the move of the timer into the background task.
let _timer = timer;
- let _span = jaeger::Span::from_encodable((block_hash, candidate_hash), "launch-approval")
- .with_relay_parent(block_hash)
- .with_candidate(candidate_hash)
- .with_stage(jaeger::Stage::ApprovalChecking);
let available_data = match a_rx.await {
Err(_) => return ApprovalState::failed(validator_index, candidate_hash),
@@ -2371,6 +2484,7 @@ async fn launch_approval(
return ApprovalState::failed(validator_index, candidate_hash)
},
};
+ drop(request_validation_data_span);
let validation_code = match code_rx.await {
Err(_) => return ApprovalState::failed(validator_index, candidate_hash),
@@ -2392,7 +2506,6 @@ async fn launch_approval(
};
let (val_tx, val_rx) = oneshot::channel();
-
sender
.send_message(CandidateValidationMessage::ValidateFromExhaustive(
available_data.validation_data,
@@ -2430,7 +2543,6 @@ async fn launch_approval(
candidate_hash,
candidate.clone(),
);
-
metrics_guard.take().on_approval_invalid();
return ApprovalState::failed(validator_index, candidate_hash)
},
@@ -2443,11 +2555,11 @@ async fn launch_approval(
"Failed to validate candidate due to internal error",
);
metrics_guard.take().on_approval_error();
+ drop(request_validation_result_span);
return ApprovalState::failed(validator_index, candidate_hash)
},
}
};
-
let (background, remote_handle) = background.remote_handle();
ctx.spawn("approval-checks", Box::pin(background)).map(move |()| remote_handle)
}
@@ -2463,6 +2575,17 @@ async fn issue_approval(
candidate_hash: CandidateHash,
ApprovalVoteRequest { validator_index, block_hash }: ApprovalVoteRequest,
) -> SubsystemResult> {
+ let mut issue_approval_span = state
+ .spans
+ .get(&block_hash)
+ .map(|span| span.child("issue-approval"))
+ .unwrap_or_else(|| jaeger::Span::new(block_hash, "issue-approval"))
+ .with_trace_id(candidate_hash)
+ .with_string_tag("block-hash", format!("{:?}", block_hash))
+ .with_candidate(candidate_hash)
+ .with_validator_index(validator_index)
+ .with_stage(jaeger::Stage::ApprovalChecking);
+
let block_entry = match db.load_block_entry(&block_hash)? {
Some(b) => b,
None => {
@@ -2487,6 +2610,7 @@ async fn issue_approval(
},
Some(idx) => idx,
};
+ issue_approval_span.add_int_tag("candidate_index", candidate_index as i64);
let session_info = match state.session_info(block_entry.session()) {
Some(s) => s,
diff --git a/node/core/approval-voting/src/ops.rs b/node/core/approval-voting/src/ops.rs
index 37f564c34f71..4d6dc5e7ad66 100644
--- a/node/core/approval-voting/src/ops.rs
+++ b/node/core/approval-voting/src/ops.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
@@ -62,7 +62,7 @@ fn visit_and_remove_block_entry(
};
overlayed_db.delete_block_entry(&block_hash);
- for &(_, ref candidate_hash) in block_entry.candidates() {
+ for (_, candidate_hash) in block_entry.candidates() {
let candidate = match visited_candidates.entry(*candidate_hash) {
Entry::Occupied(e) => e.into_mut(),
Entry::Vacant(e) => {
@@ -227,7 +227,7 @@ pub fn add_block_entry(
// read and write all updated entries.
{
- for &(_, ref candidate_hash) in entry.candidates() {
+ for (_, candidate_hash) in entry.candidates() {
let NewCandidateInfo { candidate, backing_group, our_assignment } =
match candidate_info(candidate_hash) {
None => return Ok(Vec::new()),
diff --git a/node/core/approval-voting/src/persisted_entries.rs b/node/core/approval-voting/src/persisted_entries.rs
index 1df0ff91c1a1..9b6592220275 100644
--- a/node/core/approval-voting/src/persisted_entries.rs
+++ b/node/core/approval-voting/src/persisted_entries.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/approval-voting/src/tests.rs b/node/core/approval-voting/src/tests.rs
index 3f5297e602cf..e9d599bdd91e 100644
--- a/node/core/approval-voting/src/tests.rs
+++ b/node/core/approval-voting/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
@@ -568,7 +568,7 @@ where
}
fn make_candidate(para_id: ParaId, hash: &Hash) -> CandidateReceipt {
- let mut r = dummy_candidate_receipt_bad_sig(hash.clone(), Some(Default::default()));
+ let mut r = dummy_candidate_receipt_bad_sig(*hash, Some(Default::default()));
r.descriptor.para_id = para_id;
r
}
@@ -662,13 +662,13 @@ impl ChainBuilder {
builder
}
- pub fn add_block<'a>(
- &'a mut self,
+ pub fn add_block(
+ &mut self,
hash: Hash,
parent_hash: Hash,
number: u32,
config: BlockConfig,
- ) -> &'a mut Self {
+ ) -> &mut Self {
assert!(number != 0, "cannot add duplicate genesis block");
assert!(hash != Self::GENESIS_HASH, "cannot add block with genesis hash");
assert!(
@@ -679,13 +679,13 @@ impl ChainBuilder {
self.add_block_inner(hash, parent_hash, number, config)
}
- fn add_block_inner<'a>(
- &'a mut self,
+ fn add_block_inner(
+ &mut self,
hash: Hash,
parent_hash: Hash,
number: u32,
config: BlockConfig,
- ) -> &'a mut Self {
+ ) -> &mut Self {
let header = ChainBuilder::make_header(parent_hash, config.slot, number);
assert!(
self.blocks_by_hash.insert(hash, (header, config)).is_none(),
@@ -1108,7 +1108,7 @@ fn blank_subsystem_act_on_bad_block() {
FromOrchestra::Communication {
msg: ApprovalVotingMessage::CheckAndImportAssignment(
IndirectAssignmentCert {
- block_hash: bad_block_hash.clone(),
+ block_hash: bad_block_hash,
validator: 0u32.into(),
cert: garbage_assignment_cert(AssignmentCertKind::RelayVRFModulo {
sample: 0,
@@ -2605,11 +2605,7 @@ where
candidate_hash,
1,
expect_chain_approved,
- Some(sign_approval(
- validators[validator_index as usize].clone(),
- candidate_hash,
- 1,
- )),
+ Some(sign_approval(validators[validator_index as usize], candidate_hash, 1)),
)
.await;
assert_eq!(rx.await, Ok(ApprovalCheckResult::Accepted));
diff --git a/node/core/approval-voting/src/time.rs b/node/core/approval-voting/src/time.rs
index 2d1230749a43..34132dc22b23 100644
--- a/node/core/approval-voting/src/time.rs
+++ b/node/core/approval-voting/src/time.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/av-store/src/lib.rs b/node/core/av-store/src/lib.rs
index d43dc0657d18..4a6d1d464d01 100644
--- a/node/core/av-store/src/lib.rs
+++ b/node/core/av-store/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/av-store/src/metrics.rs b/node/core/av-store/src/metrics.rs
index fedeb2b7d0e5..bd85b81c8b83 100644
--- a/node/core/av-store/src/metrics.rs
+++ b/node/core/av-store/src/metrics.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/av-store/src/tests.rs b/node/core/av-store/src/tests.rs
index e26a3507480b..f3ffc7a80e05 100644
--- a/node/core/av-store/src/tests.rs
+++ b/node/core/av-store/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/backing/src/error.rs b/node/core/backing/src/error.rs
index bbe89c0afcb9..d937dd6752b6 100644
--- a/node/core/backing/src/error.rs
+++ b/node/core/backing/src/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/backing/src/lib.rs b/node/core/backing/src/lib.rs
index 078eb1d8d618..ef5604826563 100644
--- a/node/core/backing/src/lib.rs
+++ b/node/core/backing/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/backing/src/metrics.rs b/node/core/backing/src/metrics.rs
index 742d47a0acf2..8468ea005404 100644
--- a/node/core/backing/src/metrics.rs
+++ b/node/core/backing/src/metrics.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/backing/src/tests.rs b/node/core/backing/src/tests.rs
index 47734fd28aa1..35c83297fa71 100644
--- a/node/core/backing/src/tests.rs
+++ b/node/core/backing/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/bitfield-signing/src/lib.rs b/node/core/bitfield-signing/src/lib.rs
index f02467d7f296..1e4d556de7ca 100644
--- a/node/core/bitfield-signing/src/lib.rs
+++ b/node/core/bitfield-signing/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/bitfield-signing/src/metrics.rs b/node/core/bitfield-signing/src/metrics.rs
index 571a0c335bd7..ec66af82e599 100644
--- a/node/core/bitfield-signing/src/metrics.rs
+++ b/node/core/bitfield-signing/src/metrics.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/bitfield-signing/src/tests.rs b/node/core/bitfield-signing/src/tests.rs
index 99b8c4f22b52..106ecc06b156 100644
--- a/node/core/bitfield-signing/src/tests.rs
+++ b/node/core/bitfield-signing/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/candidate-validation/src/lib.rs b/node/core/candidate-validation/src/lib.rs
index 7d3fa964eeff..dce589e4c708 100644
--- a/node/core/candidate-validation/src/lib.rs
+++ b/node/core/candidate-validation/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/candidate-validation/src/metrics.rs b/node/core/candidate-validation/src/metrics.rs
index f20d70a855c6..025e5413e72c 100644
--- a/node/core/candidate-validation/src/metrics.rs
+++ b/node/core/candidate-validation/src/metrics.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/candidate-validation/src/tests.rs b/node/core/candidate-validation/src/tests.rs
index 9e920f0e9746..4f0ebf037e3a 100644
--- a/node/core/candidate-validation/src/tests.rs
+++ b/node/core/candidate-validation/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/chain-api/src/lib.rs b/node/core/chain-api/src/lib.rs
index 012c867f3b29..9b25481d7186 100644
--- a/node/core/chain-api/src/lib.rs
+++ b/node/core/chain-api/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/chain-api/src/metrics.rs b/node/core/chain-api/src/metrics.rs
index 34c258b84563..2cf8d2b68434 100644
--- a/node/core/chain-api/src/metrics.rs
+++ b/node/core/chain-api/src/metrics.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/chain-api/src/tests.rs b/node/core/chain-api/src/tests.rs
index 9289805cc8f8..331a4f9ba820 100644
--- a/node/core/chain-api/src/tests.rs
+++ b/node/core/chain-api/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/chain-selection/src/backend.rs b/node/core/chain-selection/src/backend.rs
index 3b21e9ea99c9..71fa55ac6575 100644
--- a/node/core/chain-selection/src/backend.rs
+++ b/node/core/chain-selection/src/backend.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/chain-selection/src/db_backend/mod.rs b/node/core/chain-selection/src/db_backend/mod.rs
index 66e61426b738..f7baf9d3da18 100644
--- a/node/core/chain-selection/src/db_backend/mod.rs
+++ b/node/core/chain-selection/src/db_backend/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/chain-selection/src/db_backend/v1.rs b/node/core/chain-selection/src/db_backend/v1.rs
index 64c4e37b1502..7c7144bb763d 100644
--- a/node/core/chain-selection/src/db_backend/v1.rs
+++ b/node/core/chain-selection/src/db_backend/v1.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/chain-selection/src/lib.rs b/node/core/chain-selection/src/lib.rs
index 529b297a4dea..4b512347dae4 100644
--- a/node/core/chain-selection/src/lib.rs
+++ b/node/core/chain-selection/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/chain-selection/src/tests.rs b/node/core/chain-selection/src/tests.rs
index 3104d16dedf3..8b475bd2e13c 100644
--- a/node/core/chain-selection/src/tests.rs
+++ b/node/core/chain-selection/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/chain-selection/src/tree.rs b/node/core/chain-selection/src/tree.rs
index b714cee29101..b4aba30368a6 100644
--- a/node/core/chain-selection/src/tree.rs
+++ b/node/core/chain-selection/src/tree.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/dispute-coordinator/src/backend.rs b/node/core/dispute-coordinator/src/backend.rs
index d49ace492549..cf0bdd4043ca 100644
--- a/node/core/dispute-coordinator/src/backend.rs
+++ b/node/core/dispute-coordinator/src/backend.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/dispute-coordinator/src/db/mod.rs b/node/core/dispute-coordinator/src/db/mod.rs
index 9b79bd5bc74c..87102c5a3c48 100644
--- a/node/core/dispute-coordinator/src/db/mod.rs
+++ b/node/core/dispute-coordinator/src/db/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/dispute-coordinator/src/db/v1.rs b/node/core/dispute-coordinator/src/db/v1.rs
index c0f3c9925f1b..aa67781ddd25 100644
--- a/node/core/dispute-coordinator/src/db/v1.rs
+++ b/node/core/dispute-coordinator/src/db/v1.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/dispute-coordinator/src/error.rs b/node/core/dispute-coordinator/src/error.rs
index 7a059b8861d8..662db12ab6fd 100644
--- a/node/core/dispute-coordinator/src/error.rs
+++ b/node/core/dispute-coordinator/src/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/dispute-coordinator/src/import.rs b/node/core/dispute-coordinator/src/import.rs
index 4f6edc5fcef0..4968058a13fc 100644
--- a/node/core/dispute-coordinator/src/import.rs
+++ b/node/core/dispute-coordinator/src/import.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
@@ -97,7 +97,7 @@ pub enum OwnVoteState {
}
impl OwnVoteState {
- fn new<'a>(votes: &CandidateVotes, env: &CandidateEnvironment<'a>) -> Self {
+ fn new(votes: &CandidateVotes, env: &CandidateEnvironment<'_>) -> Self {
let controlled_indices = env.controlled_indices();
if controlled_indices.is_empty() {
return Self::CannotVote
diff --git a/node/core/dispute-coordinator/src/initialized.rs b/node/core/dispute-coordinator/src/initialized.rs
index f1e6d516d6cf..e050de0cdae3 100644
--- a/node/core/dispute-coordinator/src/initialized.rs
+++ b/node/core/dispute-coordinator/src/initialized.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/dispute-coordinator/src/lib.rs b/node/core/dispute-coordinator/src/lib.rs
index d82c3a06c65e..6ad7b13517a8 100644
--- a/node/core/dispute-coordinator/src/lib.rs
+++ b/node/core/dispute-coordinator/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/dispute-coordinator/src/metrics.rs b/node/core/dispute-coordinator/src/metrics.rs
index 977f5cc700f6..7c13614ff885 100644
--- a/node/core/dispute-coordinator/src/metrics.rs
+++ b/node/core/dispute-coordinator/src/metrics.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/dispute-coordinator/src/participation/mod.rs b/node/core/dispute-coordinator/src/participation/mod.rs
index e366adc5facb..b6a41bcff9dd 100644
--- a/node/core/dispute-coordinator/src/participation/mod.rs
+++ b/node/core/dispute-coordinator/src/participation/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
@@ -160,10 +160,11 @@ impl Participation {
&mut self,
ctx: &mut Context,
priority: ParticipationPriority,
- req: ParticipationRequest,
+ mut req: ParticipationRequest,
) -> Result<()> {
- // Participation already running - we can ignore that request:
+ // Participation already running - we can ignore that request, discarding its timer:
if self.running_participations.contains(req.candidate_hash()) {
+ req.discard_timer();
return Ok(())
}
// Available capacity - participate right away (if we already have a recent block):
diff --git a/node/core/dispute-coordinator/src/participation/queues/mod.rs b/node/core/dispute-coordinator/src/participation/queues/mod.rs
index a5a5ab962f5a..4d8ee585ea29 100644
--- a/node/core/dispute-coordinator/src/participation/queues/mod.rs
+++ b/node/core/dispute-coordinator/src/participation/queues/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
@@ -134,6 +134,11 @@ impl ParticipationRequest {
pub fn session(&self) -> SessionIndex {
self.session
}
+ pub fn discard_timer(&mut self) {
+ if let Some(timer) = self.request_timer.take() {
+ timer.stop_and_discard();
+ }
+ }
pub fn into_candidate_info(self) -> (CandidateHash, CandidateReceipt) {
let Self { candidate_hash, candidate_receipt, .. } = self;
(candidate_hash, candidate_receipt)
@@ -246,17 +251,12 @@ impl Queues {
// Remove any best effort entry, using it to replace our new
// request.
if let Some(older_request) = self.best_effort.remove(&comparator) {
- if let Some(timer) = req.request_timer {
- timer.stop_and_discard();
- }
+ req.discard_timer();
req = older_request;
}
// Keeping old request if any.
match self.priority.entry(comparator) {
- Entry::Occupied(_) =>
- if let Some(timer) = req.request_timer {
- timer.stop_and_discard();
- },
+ Entry::Occupied(_) => req.discard_timer(),
Entry::Vacant(vac) => {
vac.insert(req);
},
@@ -274,10 +274,7 @@ impl Queues {
}
// Keeping old request if any.
match self.best_effort.entry(comparator) {
- Entry::Occupied(_) =>
- if let Some(timer) = req.request_timer {
- timer.stop_and_discard();
- },
+ Entry::Occupied(_) => req.discard_timer(),
Entry::Vacant(vac) => {
vac.insert(req);
},
diff --git a/node/core/dispute-coordinator/src/participation/queues/tests.rs b/node/core/dispute-coordinator/src/participation/queues/tests.rs
index e4ccd0de8d9f..ec549d1f5130 100644
--- a/node/core/dispute-coordinator/src/participation/queues/tests.rs
+++ b/node/core/dispute-coordinator/src/participation/queues/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/dispute-coordinator/src/participation/tests.rs b/node/core/dispute-coordinator/src/participation/tests.rs
index a5fbe2d6a5dd..ab58db4e7628 100644
--- a/node/core/dispute-coordinator/src/participation/tests.rs
+++ b/node/core/dispute-coordinator/src/participation/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/dispute-coordinator/src/scraping/candidates.rs b/node/core/dispute-coordinator/src/scraping/candidates.rs
index c84abc59c285..89323907a732 100644
--- a/node/core/dispute-coordinator/src/scraping/candidates.rs
+++ b/node/core/dispute-coordinator/src/scraping/candidates.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/dispute-coordinator/src/scraping/mod.rs b/node/core/dispute-coordinator/src/scraping/mod.rs
index 0e3c4ecc29ba..2d2096f62614 100644
--- a/node/core/dispute-coordinator/src/scraping/mod.rs
+++ b/node/core/dispute-coordinator/src/scraping/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
@@ -151,7 +151,10 @@ impl Inclusions {
/// `process_active_leaves_update` any scraped votes.
///
/// Scraped candidates are available `DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION` more blocks
-/// after finalization as a precaution not to prune them prematurely.
+/// after finalization as a precaution not to prune them prematurely. Besides the newly scraped
+/// candidates `DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION` finalized blocks are parsed as
+/// another precaution to have their `CandidateReceipts` available in case a dispute is raised on
+/// them,
pub struct ChainScraper {
/// All candidates we have seen included, which not yet have been finalized.
included_candidates: candidates::ScrapedCandidates,
@@ -228,9 +231,10 @@ impl ChainScraper {
None => return Ok(ScrapedUpdates::new()),
};
- // Fetch ancestry up to last finalized block.
+ // Fetch ancestry up to `SCRAPED_FINALIZED_BLOCKS_COUNT` blocks beyond
+ // the last finalized one
let ancestors = self
- .get_unfinalized_block_ancestors(sender, activated.hash, activated.number)
+ .get_relevant_block_ancestors(sender, activated.hash, activated.number)
.await?;
// Ancestors block numbers are consecutive in the descending order.
@@ -330,10 +334,11 @@ impl ChainScraper {
}
/// Returns ancestors of `head` in the descending order, stopping
- /// either at the block present in cache or at the last finalized block.
+ /// either at the block present in cache or at `SCRAPED_FINALIZED_BLOCKS_COUNT -1` blocks after
+ /// the last finalized one (called `target_ancestor`).
///
- /// Both `head` and the latest finalized block are **not** included in the result.
- async fn get_unfinalized_block_ancestors(
+ /// Both `head` and the `target_ancestor` blocks are **not** included in the result.
+ async fn get_relevant_block_ancestors(
&mut self,
sender: &mut Sender,
mut head: Hash,
@@ -342,7 +347,9 @@ impl ChainScraper {
where
Sender: overseer::DisputeCoordinatorSenderTrait,
{
- let target_ancestor = get_finalized_block_number(sender).await?;
+ let target_ancestor = get_finalized_block_number(sender)
+ .await?
+ .saturating_sub(DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION);
let mut ancestors = Vec::new();
diff --git a/node/core/dispute-coordinator/src/scraping/tests.rs b/node/core/dispute-coordinator/src/scraping/tests.rs
index b7183739d8f8..55726b3f2727 100644
--- a/node/core/dispute-coordinator/src/scraping/tests.rs
+++ b/node/core/dispute-coordinator/src/scraping/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
@@ -410,7 +410,8 @@ fn scraper_requests_candidates_of_non_finalized_ancestors() {
&mut virtual_overseer,
&chain,
finalized_block_number,
- BLOCKS_TO_SKIP - finalized_block_number as usize, // Expect the provider not to go past finalized block.
+ BLOCKS_TO_SKIP -
+ (finalized_block_number - DISPUTE_CANDIDATE_LIFETIME_AFTER_FINALIZATION) as usize, // Expect the provider not to go past finalized block.
get_backed_and_included_candidate_events,
);
join(process_active_leaves_update(ctx.sender(), &mut ordering, next_update), overseer_fut)
diff --git a/node/core/dispute-coordinator/src/spam_slots.rs b/node/core/dispute-coordinator/src/spam_slots.rs
index cdb9e6fb0bdc..fd2f65b1bc8e 100644
--- a/node/core/dispute-coordinator/src/spam_slots.rs
+++ b/node/core/dispute-coordinator/src/spam_slots.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/dispute-coordinator/src/status.rs b/node/core/dispute-coordinator/src/status.rs
index a74a02f2b083..557d1dacca1d 100644
--- a/node/core/dispute-coordinator/src/status.rs
+++ b/node/core/dispute-coordinator/src/status.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/dispute-coordinator/src/tests.rs b/node/core/dispute-coordinator/src/tests.rs
index 8d72ed79100d..1792075e1978 100644
--- a/node/core/dispute-coordinator/src/tests.rs
+++ b/node/core/dispute-coordinator/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/parachains-inherent/src/lib.rs b/node/core/parachains-inherent/src/lib.rs
index 2df6b3de8ab6..f27481ee5a7d 100644
--- a/node/core/parachains-inherent/src/lib.rs
+++ b/node/core/parachains-inherent/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/provisioner/src/disputes/mod.rs b/node/core/provisioner/src/disputes/mod.rs
index e5649e7b6c04..4fcfa5b330cb 100644
--- a/node/core/provisioner/src/disputes/mod.rs
+++ b/node/core/provisioner/src/disputes/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/provisioner/src/disputes/prioritized_selection/mod.rs b/node/core/provisioner/src/disputes/prioritized_selection/mod.rs
index 630fd33855a5..5c8aaad422f2 100644
--- a/node/core/provisioner/src/disputes/prioritized_selection/mod.rs
+++ b/node/core/provisioner/src/disputes/prioritized_selection/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/provisioner/src/disputes/prioritized_selection/tests.rs b/node/core/provisioner/src/disputes/prioritized_selection/tests.rs
index 96b509a59095..4ae67e3b7968 100644
--- a/node/core/provisioner/src/disputes/prioritized_selection/tests.rs
+++ b/node/core/provisioner/src/disputes/prioritized_selection/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/provisioner/src/disputes/random_selection/mod.rs b/node/core/provisioner/src/disputes/random_selection/mod.rs
index e08ee4c109b1..06d4ef34b665 100644
--- a/node/core/provisioner/src/disputes/random_selection/mod.rs
+++ b/node/core/provisioner/src/disputes/random_selection/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/provisioner/src/error.rs b/node/core/provisioner/src/error.rs
index c049a326a735..0f1747995843 100644
--- a/node/core/provisioner/src/error.rs
+++ b/node/core/provisioner/src/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/provisioner/src/lib.rs b/node/core/provisioner/src/lib.rs
index 0c9853e90191..50254ce9bef9 100644
--- a/node/core/provisioner/src/lib.rs
+++ b/node/core/provisioner/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/provisioner/src/metrics.rs b/node/core/provisioner/src/metrics.rs
index f4f683470227..747b39f3da83 100644
--- a/node/core/provisioner/src/metrics.rs
+++ b/node/core/provisioner/src/metrics.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/provisioner/src/tests.rs b/node/core/provisioner/src/tests.rs
index a15608305a1a..e8692df8543a 100644
--- a/node/core/provisioner/src/tests.rs
+++ b/node/core/provisioner/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2017-2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/pvf-checker/src/interest_view.rs b/node/core/pvf-checker/src/interest_view.rs
index 2d537388aa53..05a6f12de5d8 100644
--- a/node/core/pvf-checker/src/interest_view.rs
+++ b/node/core/pvf-checker/src/interest_view.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/pvf-checker/src/lib.rs b/node/core/pvf-checker/src/lib.rs
index 60b886426b59..222e85e36542 100644
--- a/node/core/pvf-checker/src/lib.rs
+++ b/node/core/pvf-checker/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/pvf-checker/src/metrics.rs b/node/core/pvf-checker/src/metrics.rs
index 7241e9f14df5..374396b3b650 100644
--- a/node/core/pvf-checker/src/metrics.rs
+++ b/node/core/pvf-checker/src/metrics.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/pvf-checker/src/runtime_api.rs b/node/core/pvf-checker/src/runtime_api.rs
index b42f5943af56..ded991e0a4a6 100644
--- a/node/core/pvf-checker/src/runtime_api.rs
+++ b/node/core/pvf-checker/src/runtime_api.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/pvf-checker/src/tests.rs b/node/core/pvf-checker/src/tests.rs
index b06285facc44..46e760936144 100644
--- a/node/core/pvf-checker/src/tests.rs
+++ b/node/core/pvf-checker/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/pvf/Cargo.toml b/node/core/pvf/Cargo.toml
index b6c56c65951b..6478edc44115 100644
--- a/node/core/pvf/Cargo.toml
+++ b/node/core/pvf/Cargo.toml
@@ -15,6 +15,7 @@ cpu-time = "1.0.0"
futures = "0.3.21"
futures-timer = "3.0.2"
gum = { package = "tracing-gum", path = "../../gum" }
+libc = "0.2.139"
pin-project = "1.0.9"
rand = "0.8.5"
rayon = "1.5.1"
@@ -41,8 +42,10 @@ sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch =
sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
+[build-dependencies]
+substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
+
[target.'cfg(target_os = "linux")'.dependencies]
-libc = "0.2.139"
tikv-jemalloc-ctl = "0.5.0"
[dev-dependencies]
diff --git a/node/core/pvf/bin/puppet_worker.rs b/node/core/pvf/bin/puppet_worker.rs
index 4b026e96a809..7f93519d8454 100644
--- a/node/core/pvf/bin/puppet_worker.rs
+++ b/node/core/pvf/bin/puppet_worker.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/pvf/build.rs b/node/core/pvf/build.rs
new file mode 100644
index 000000000000..40e9f832586e
--- /dev/null
+++ b/node/core/pvf/build.rs
@@ -0,0 +1,19 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot. If not, see .
+
+fn main() {
+ substrate_build_script_utils::generate_cargo_keys();
+}
diff --git a/node/core/pvf/src/artifacts.rs b/node/core/pvf/src/artifacts.rs
index 760e7ed46a1c..0c6146ec8a82 100644
--- a/node/core/pvf/src/artifacts.rs
+++ b/node/core/pvf/src/artifacts.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/pvf/src/error.rs b/node/core/pvf/src/error.rs
index 5edf435e7190..662fcc22cd31 100644
--- a/node/core/pvf/src/error.rs
+++ b/node/core/pvf/src/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
@@ -29,12 +29,11 @@ pub enum PrepareError {
Prevalidation(String),
/// Compilation failed for the given PVF.
Preparation(String),
- /// An unexpected panic has occured in the preparation worker.
+ /// An unexpected panic has occurred in the preparation worker.
Panic(String),
/// Failed to prepare the PVF due to the time limit.
TimedOut,
- /// An IO error occurred while receiving the result from the worker process. This state is reported by the
- /// validation host (not by the worker).
+ /// An IO error occurred. This state is reported by either the validation host or by the worker.
IoErr(String),
/// The temporary file for the artifact could not be created at the given cache path. This state is reported by the
/// validation host (not by the worker).
diff --git a/node/core/pvf/src/execute/mod.rs b/node/core/pvf/src/execute/mod.rs
index bc7f035a8b40..e863b4e24e54 100644
--- a/node/core/pvf/src/execute/mod.rs
+++ b/node/core/pvf/src/execute/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/pvf/src/execute/queue.rs b/node/core/pvf/src/execute/queue.rs
index af9c0d8672ef..3e977cfa4c5d 100644
--- a/node/core/pvf/src/execute/queue.rs
+++ b/node/core/pvf/src/execute/queue.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/pvf/src/execute/worker.rs b/node/core/pvf/src/execute/worker.rs
index 523be67da268..c30ebceae693 100644
--- a/node/core/pvf/src/execute/worker.rs
+++ b/node/core/pvf/src/execute/worker.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
@@ -47,9 +47,13 @@ pub async fn spawn(
executor_params: ExecutorParams,
spawn_timeout: Duration,
) -> Result<(IdleWorker, WorkerHandle), SpawnErr> {
- let (mut idle_worker, worker_handle) =
- spawn_with_program_path("execute", program_path, &["execute-worker"], spawn_timeout)
- .await?;
+ let (mut idle_worker, worker_handle) = spawn_with_program_path(
+ "execute",
+ program_path,
+ &["execute-worker", "--node-impl-version", env!("SUBSTRATE_CLI_IMPL_VERSION")],
+ spawn_timeout,
+ )
+ .await?;
send_handshake(&mut idle_worker.stream, Handshake { executor_params })
.await
.map_err(|error| {
@@ -257,14 +261,24 @@ impl Response {
Self::InvalidCandidate(format!("{}: {}", ctx, msg))
}
}
+ fn format_internal(ctx: &'static str, msg: &str) -> Self {
+ if msg.is_empty() {
+ Self::InternalError(ctx.to_string())
+ } else {
+ Self::InternalError(format!("{}: {}", ctx, msg))
+ }
+ }
}
/// The entrypoint that the spawned execute worker should start with. The `socket_path` specifies
-/// the path to the socket used to communicate with the host.
-pub fn worker_entrypoint(socket_path: &str) {
- worker_event_loop("execute", socket_path, |rt_handle, mut stream| async move {
- let handshake = recv_handshake(&mut stream).await?;
+/// the path to the socket used to communicate with the host. The `node_version`, if `Some`,
+/// is checked against the worker version. A mismatch results in immediate worker termination.
+/// `None` is used for tests and in other situations when version check is not necessary.
+pub fn worker_entrypoint(socket_path: &str, node_version: Option<&str>) {
+ worker_event_loop("execute", socket_path, node_version, |rt_handle, mut stream| async move {
+ let worker_pid = std::process::id();
+ let handshake = recv_handshake(&mut stream).await?;
let executor = Arc::new(Executor::new(handshake.executor_params).map_err(|e| {
io::Error::new(io::ErrorKind::Other, format!("cannot create executor: {}", e))
})?);
@@ -273,7 +287,7 @@ pub fn worker_entrypoint(socket_path: &str) {
let (artifact_path, params, execution_timeout) = recv_request(&mut stream).await?;
gum::debug!(
target: LOG_TARGET,
- worker_pid = %std::process::id(),
+ %worker_pid,
"worker: validating artifact {}",
artifact_path.display(),
);
@@ -283,7 +297,7 @@ pub fn worker_entrypoint(socket_path: &str) {
let cpu_time_start = ProcessTime::now();
// Spawn a new thread that runs the CPU time monitor.
- let thread_fut = rt_handle
+ let cpu_time_monitor_fut = rt_handle
.spawn_blocking(move || {
cpu_time_monitor_loop(cpu_time_start, execution_timeout, finished_rx)
})
@@ -295,19 +309,19 @@ pub fn worker_entrypoint(socket_path: &str) {
})
.fuse();
- pin_mut!(thread_fut);
+ pin_mut!(cpu_time_monitor_fut);
pin_mut!(execute_fut);
let response = select_biased! {
// If this future is not selected, the join handle is dropped and the thread will
// finish in the background.
- join_res = thread_fut => {
- match join_res {
+ cpu_time_monitor_res = cpu_time_monitor_fut => {
+ match cpu_time_monitor_res {
Ok(Some(cpu_time_elapsed)) => {
// Log if we exceed the timeout and the other thread hasn't finished.
gum::warn!(
target: LOG_TARGET,
- worker_pid = %std::process::id(),
+ %worker_pid,
"execute job took {}ms cpu time, exceeded execute timeout {}ms",
cpu_time_elapsed.as_millis(),
execution_timeout.as_millis(),
@@ -315,12 +329,12 @@ pub fn worker_entrypoint(socket_path: &str) {
Response::TimedOut
},
Ok(None) => Response::InternalError("error communicating over finished channel".into()),
- Err(e) => Response::InternalError(format!("{}", e)),
+ Err(e) => Response::format_internal("cpu time monitor thread error", &e.to_string()),
}
},
execute_res = execute_fut => {
let _ = finished_tx.send(());
- execute_res.unwrap_or_else(|e| Response::InternalError(format!("{}", e)))
+ execute_res.unwrap_or_else(|e| Response::format_internal("execute thread error", &e.to_string()))
},
};
@@ -349,7 +363,7 @@ fn validate_using_artifact(
let result_descriptor = match ValidationResult::decode(&mut &descriptor_bytes[..]) {
Err(err) =>
- return Response::InvalidCandidate(format!("validation result decoding failed: {}", err)),
+ return Response::format_invalid("validation result decoding failed", &err.to_string()),
Ok(r) => r,
};
diff --git a/node/core/pvf/src/executor_intf.rs b/node/core/pvf/src/executor_intf.rs
index af552077bc43..54bf6fd6bc17 100644
--- a/node/core/pvf/src/executor_intf.rs
+++ b/node/core/pvf/src/executor_intf.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
@@ -86,6 +86,14 @@ const DEFAULT_CONFIG: Config = Config {
// On the one hand, it simplifies the code, on the other, however, slows down compile times
// for execute requests. This behavior may change in future.
parallel_compilation: false,
+
+ // WASM extensions. Only those that are meaningful to us may be controlled here. By default,
+ // we're using WASM MVP, which means all the extensions are disabled. Nevertheless, some
+ // extensions (e.g., sign extension ops) are enabled by Wasmtime and cannot be disabled.
+ wasm_reference_types: false,
+ wasm_simd: false,
+ wasm_bulk_memory: false,
+ wasm_multi_value: false,
},
};
@@ -125,6 +133,7 @@ fn params_to_wasmtime_semantics(par: &ExecutorParams) -> Result stack_limit.logical_max = *slm,
ExecutorParam::StackNativeMax(snm) => stack_limit.native_stack_max = *snm,
+ ExecutorParam::WasmExtBulkMemory => sem.wasm_bulk_memory = true,
ExecutorParam::PrecheckingMaxMemory(_) => (), // TODO: Not implemented yet
ExecutorParam::PvfPrepTimeout(_, _) | ExecutorParam::PvfExecTimeout(_, _) => (), // Not used here
}
@@ -135,7 +144,6 @@ fn params_to_wasmtime_semantics(par: &ExecutorParams) -> Result Result, String> {
- let spawner = self.spawner.clone();
let mut result = None;
self.thread_pool.scope({
let result = &mut result;
@@ -219,7 +223,7 @@ impl Executor {
s.spawn(move |_| {
// spawn does not return a value, so we need to use a variable to pass the result.
*result = Some(
- do_execute(compiled_artifact_path, self.config.clone(), params, spawner)
+ do_execute(compiled_artifact_path, self.config.clone(), params)
.map_err(|err| format!("execute error: {:?}", err)),
);
});
@@ -233,11 +237,9 @@ unsafe fn do_execute(
compiled_artifact_path: &Path,
config: Config,
params: &[u8],
- spawner: impl sp_core::traits::SpawnNamed + 'static,
) -> Result, sc_executor_common::error::Error> {
let mut extensions = sp_externalities::Extensions::new();
- extensions.register(sp_core::traits::TaskExecutorExt::new(spawner));
extensions.register(sp_core::traits::ReadRuntimeVersionExt::new(ReadRuntimeVersion));
let mut ext = ValidationExternalities(extensions);
@@ -406,43 +408,6 @@ impl sp_externalities::ExtensionStore for ValidationExternalities {
}
}
-/// An implementation of `SpawnNamed` on top of a futures' thread pool.
-///
-/// This is a light handle meaning it will only clone the handle not create a new thread pool.
-#[derive(Clone)]
-pub(crate) struct TaskSpawner(futures::executor::ThreadPool);
-
-impl TaskSpawner {
- pub(crate) fn new() -> Result {
- futures::executor::ThreadPoolBuilder::new()
- .pool_size(4)
- .name_prefix("pvf-task-executor")
- .create()
- .map_err(|e| e.to_string())
- .map(Self)
- }
-}
-
-impl sp_core::traits::SpawnNamed for TaskSpawner {
- fn spawn_blocking(
- &self,
- _task_name: &'static str,
- _subsystem_name: Option<&'static str>,
- future: futures::future::BoxFuture<'static, ()>,
- ) {
- self.0.spawn_ok(future);
- }
-
- fn spawn(
- &self,
- _task_name: &'static str,
- _subsystem_name: Option<&'static str>,
- future: futures::future::BoxFuture<'static, ()>,
- ) {
- self.0.spawn_ok(future);
- }
-}
-
struct ReadRuntimeVersion;
impl sp_core::traits::ReadRuntimeVersion for ReadRuntimeVersion {
diff --git a/node/core/pvf/src/host.rs b/node/core/pvf/src/host.rs
index eeb0936e898f..31a0266145f8 100644
--- a/node/core/pvf/src/host.rs
+++ b/node/core/pvf/src/host.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/pvf/src/lib.rs b/node/core/pvf/src/lib.rs
index 8c40bbb8b939..8b6f2ddb262c 100644
--- a/node/core/pvf/src/lib.rs
+++ b/node/core/pvf/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/pvf/src/metrics.rs b/node/core/pvf/src/metrics.rs
index 72e6d01e7a2f..12bcd9eadad3 100644
--- a/node/core/pvf/src/metrics.rs
+++ b/node/core/pvf/src/metrics.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/pvf/src/prepare/memory_stats.rs b/node/core/pvf/src/prepare/memory_stats.rs
index 0e27fac20875..069ef46caba4 100644
--- a/node/core/pvf/src/prepare/memory_stats.rs
+++ b/node/core/pvf/src/prepare/memory_stats.rs
@@ -1,4 +1,4 @@
-// Copyright 2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/pvf/src/prepare/mod.rs b/node/core/pvf/src/prepare/mod.rs
index bac212e514b0..d8d036a82238 100644
--- a/node/core/pvf/src/prepare/mod.rs
+++ b/node/core/pvf/src/prepare/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/pvf/src/prepare/pool.rs b/node/core/pvf/src/prepare/pool.rs
index 8587fcb1a6b6..f8435a40348d 100644
--- a/node/core/pvf/src/prepare/pool.rs
+++ b/node/core/pvf/src/prepare/pool.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/pvf/src/prepare/queue.rs b/node/core/pvf/src/prepare/queue.rs
index 38db463a33b7..20ee95a435b2 100644
--- a/node/core/pvf/src/prepare/queue.rs
+++ b/node/core/pvf/src/prepare/queue.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/pvf/src/prepare/worker.rs b/node/core/pvf/src/prepare/worker.rs
index 962ad2742bf8..3b2ae211e6ca 100644
--- a/node/core/pvf/src/prepare/worker.rs
+++ b/node/core/pvf/src/prepare/worker.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
@@ -52,7 +52,13 @@ pub async fn spawn(
program_path: &Path,
spawn_timeout: Duration,
) -> Result<(IdleWorker, WorkerHandle), SpawnErr> {
- spawn_with_program_path("prepare", program_path, &["prepare-worker"], spawn_timeout).await
+ spawn_with_program_path(
+ "prepare",
+ program_path,
+ &["prepare-worker", "--node-impl-version", env!("SUBSTRATE_CLI_IMPL_VERSION")],
+ spawn_timeout,
+ )
+ .await
}
pub enum Outcome {
@@ -321,7 +327,9 @@ async fn recv_response(stream: &mut UnixStream, pid: u32) -> io::Result io::Result) {
+ worker_event_loop("prepare", socket_path, node_version, |rt_handle, mut stream| async move {
+ let worker_pid = std::process::id();
+
loop {
- let worker_pid = std::process::id();
let (pvf, dest) = recv_request(&mut stream).await?;
gum::debug!(
target: LOG_TARGET,
diff --git a/node/core/pvf/src/priority.rs b/node/core/pvf/src/priority.rs
index b80c9195832a..d4bd49eaee84 100644
--- a/node/core/pvf/src/priority.rs
+++ b/node/core/pvf/src/priority.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/pvf/src/pvf.rs b/node/core/pvf/src/pvf.rs
index 7e7aa6be5245..ad2dc5fcd918 100644
--- a/node/core/pvf/src/pvf.rs
+++ b/node/core/pvf/src/pvf.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
diff --git a/node/core/pvf/src/testing.rs b/node/core/pvf/src/testing.rs
index f0b6a0a60f7c..fb1b406cdad6 100644
--- a/node/core/pvf/src/testing.rs
+++ b/node/core/pvf/src/testing.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
@@ -61,22 +61,34 @@ macro_rules! decl_puppet_worker_main {
$crate::sp_tracing::try_init_simple();
let args = std::env::args().collect::>();
- if args.len() < 2 {
+ if args.len() < 3 {
panic!("wrong number of arguments");
}
+ let mut version = None;
+ let mut socket_path: &str = "";
+
+ for i in 2..args.len() {
+ match args[i].as_ref() {
+ "--socket-path" => socket_path = args[i + 1].as_str(),
+ "--node-version" => version = Some(args[i + 1].as_str()),
+ _ => (),
+ }
+ }
+
let subcommand = &args[1];
match subcommand.as_ref() {
+ "exit" => {
+ std::process::exit(1);
+ },
"sleep" => {
std::thread::sleep(std::time::Duration::from_secs(5));
},
"prepare-worker" => {
- let socket_path = &args[2];
- $crate::prepare_worker_entrypoint(socket_path);
+ $crate::prepare_worker_entrypoint(&socket_path, version);
},
"execute-worker" => {
- let socket_path = &args[2];
- $crate::execute_worker_entrypoint(socket_path);
+ $crate::execute_worker_entrypoint(&socket_path, version);
},
other => panic!("unknown subcommand: {}", other),
}
diff --git a/node/core/pvf/src/worker_common.rs b/node/core/pvf/src/worker_common.rs
index 430a6950fb4f..3caee34a5d0f 100644
--- a/node/core/pvf/src/worker_common.rs
+++ b/node/core/pvf/src/worker_common.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
@@ -61,6 +61,8 @@ pub async fn spawn_with_program_path(
gum::warn!(
target: LOG_TARGET,
%debug_id,
+ ?program_path,
+ ?extra_args,
"cannot bind unix socket: {:?}",
err,
);
@@ -68,10 +70,12 @@ pub async fn spawn_with_program_path(
})?;
let handle =
- WorkerHandle::spawn(program_path, extra_args, socket_path).map_err(|err| {
+ WorkerHandle::spawn(&program_path, extra_args, socket_path).map_err(|err| {
gum::warn!(
target: LOG_TARGET,
%debug_id,
+ ?program_path,
+ ?extra_args,
"cannot spawn a worker: {:?}",
err,
);
@@ -84,6 +88,8 @@ pub async fn spawn_with_program_path(
gum::warn!(
target: LOG_TARGET,
%debug_id,
+ ?program_path,
+ ?extra_args,
"cannot accept a worker: {:?}",
err,
);
@@ -92,6 +98,14 @@ pub async fn spawn_with_program_path(
Ok((IdleWorker { stream, pid: handle.id() }, handle))
}
_ = Delay::new(spawn_timeout).fuse() => {
+ gum::warn!(
+ target: LOG_TARGET,
+ %debug_id,
+ ?program_path,
+ ?extra_args,
+ ?spawn_timeout,
+ "spawning and connecting to socket timed out",
+ );
Err(SpawnErr::AcceptTimeout)
}
}
@@ -157,11 +171,35 @@ pub async fn tmpfile(prefix: &str) -> io::Result {
tmpfile_in(prefix, &temp_dir).await
}
-pub fn worker_event_loop(debug_id: &'static str, socket_path: &str, mut event_loop: F)
-where
+pub fn worker_event_loop(
+ debug_id: &'static str,
+ socket_path: &str,
+ node_version: Option<&str>,
+ mut event_loop: F,
+) where
F: FnMut(Handle, UnixStream) -> Fut,
Fut: futures::Future