From fb4832f7c555d76c1d2660784455a5ab669ac14e Mon Sep 17 00:00:00 2001 From: Wei Tang Date: Mon, 13 Jul 2020 08:23:27 +0200 Subject: [PATCH 1/4] Update wasm-builder version to 2.0.0 --- parachain/test-parachains/adder/build.rs | 2 +- parachain/test-parachains/code-upgrader/build.rs | 2 +- parachain/test-parachains/halt/build.rs | 2 +- runtime/kusama/build.rs | 2 +- runtime/polkadot/build.rs | 2 +- runtime/test-runtime/build.rs | 2 +- runtime/westend/build.rs | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/parachain/test-parachains/adder/build.rs b/parachain/test-parachains/adder/build.rs index 9a2e2c8fddbe..2e407bbef387 100644 --- a/parachain/test-parachains/adder/build.rs +++ b/parachain/test-parachains/adder/build.rs @@ -19,7 +19,7 @@ use wasm_builder_runner::WasmBuilder; fn main() { WasmBuilder::new() .with_current_project() - .with_wasm_builder_from_crates("1.0.11") + .with_wasm_builder_from_crates("2.0.0") .export_heap_base() .build() } diff --git a/parachain/test-parachains/code-upgrader/build.rs b/parachain/test-parachains/code-upgrader/build.rs index 9a2e2c8fddbe..2e407bbef387 100644 --- a/parachain/test-parachains/code-upgrader/build.rs +++ b/parachain/test-parachains/code-upgrader/build.rs @@ -19,7 +19,7 @@ use wasm_builder_runner::WasmBuilder; fn main() { WasmBuilder::new() .with_current_project() - .with_wasm_builder_from_crates("1.0.11") + .with_wasm_builder_from_crates("2.0.0") .export_heap_base() .build() } diff --git a/parachain/test-parachains/halt/build.rs b/parachain/test-parachains/halt/build.rs index 9a2e2c8fddbe..2e407bbef387 100644 --- a/parachain/test-parachains/halt/build.rs +++ b/parachain/test-parachains/halt/build.rs @@ -19,7 +19,7 @@ use wasm_builder_runner::WasmBuilder; fn main() { WasmBuilder::new() .with_current_project() - .with_wasm_builder_from_crates("1.0.11") + .with_wasm_builder_from_crates("2.0.0") .export_heap_base() .build() } diff --git a/runtime/kusama/build.rs b/runtime/kusama/build.rs index 56051bd627f6..af219a293198 100644 --- a/runtime/kusama/build.rs +++ b/runtime/kusama/build.rs @@ -19,7 +19,7 @@ use wasm_builder_runner::WasmBuilder; fn main() { WasmBuilder::new() .with_current_project() - .with_wasm_builder_from_crates("1.0.11") + .with_wasm_builder_from_crates("2.0.0") .import_memory() .export_heap_base() .build() diff --git a/runtime/polkadot/build.rs b/runtime/polkadot/build.rs index 4ad34b2b5293..f65f04914e53 100644 --- a/runtime/polkadot/build.rs +++ b/runtime/polkadot/build.rs @@ -19,7 +19,7 @@ use wasm_builder_runner::WasmBuilder; fn main() { WasmBuilder::new() .with_current_project() - .with_wasm_builder_from_crates("1.0.11") + .with_wasm_builder_from_crates("2.0.0") .import_memory() .export_heap_base() .build() diff --git a/runtime/test-runtime/build.rs b/runtime/test-runtime/build.rs index 56051bd627f6..af219a293198 100644 --- a/runtime/test-runtime/build.rs +++ b/runtime/test-runtime/build.rs @@ -19,7 +19,7 @@ use wasm_builder_runner::WasmBuilder; fn main() { WasmBuilder::new() .with_current_project() - .with_wasm_builder_from_crates("1.0.11") + .with_wasm_builder_from_crates("2.0.0") .import_memory() .export_heap_base() .build() diff --git a/runtime/westend/build.rs b/runtime/westend/build.rs index 56051bd627f6..af219a293198 100644 --- a/runtime/westend/build.rs +++ b/runtime/westend/build.rs @@ -19,7 +19,7 @@ use wasm_builder_runner::WasmBuilder; fn main() { WasmBuilder::new() .with_current_project() - .with_wasm_builder_from_crates("1.0.11") + .with_wasm_builder_from_crates("2.0.0") .import_memory() .export_heap_base() .build() From f018cf22b5197611e6c264606b7d7aba24b60449 Mon Sep 17 00:00:00 2001 From: Wei Tang Date: Mon, 13 Jul 2020 09:22:02 +0200 Subject: [PATCH 2/4] Fix all crate compile --- Cargo.lock | 274 +++++++++--------- cli/src/command.rs | 18 +- node/service/src/chain_spec.rs | 129 +++++---- node/test-service/src/chain_spec.rs | 2 +- parachain/test-parachains/adder/src/lib.rs | 7 + .../test-parachains/code-upgrader/src/lib.rs | 7 + parachain/test-parachains/halt/src/lib.rs | 8 +- parachain/test-parachains/tests/adder/mod.rs | 8 +- .../tests/code_upgrader/mod.rs | 12 +- .../tests/wasm_executor/mod.rs | 9 +- service/src/chain_spec.rs | 129 +++++---- 11 files changed, 335 insertions(+), 268 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9f8d5c94f08c..59e9503e4966 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1314,7 +1314,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "parity-scale-codec", ] @@ -1322,7 +1322,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-support", "frame-system", @@ -1339,7 +1339,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "Inflector", "frame-benchmarking", @@ -1358,7 +1358,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-support", "frame-system", @@ -1373,7 +1373,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "parity-scale-codec", "serde", @@ -1384,7 +1384,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "bitmask", "frame-metadata", @@ -1409,7 +1409,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.18", @@ -1420,7 +1420,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1432,7 +1432,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -1442,7 +1442,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1458,7 +1458,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-benchmarking", "frame-support", @@ -1472,7 +1472,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "parity-scale-codec", "sp-api", @@ -3466,7 +3466,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-support", "frame-system", @@ -3482,7 +3482,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-support", "frame-system", @@ -3497,7 +3497,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-benchmarking", "frame-support", @@ -3522,7 +3522,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-benchmarking", "frame-support", @@ -3536,7 +3536,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-benchmarking", "frame-support", @@ -3552,7 +3552,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-benchmarking", "frame-support", @@ -3567,7 +3567,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-benchmarking", "frame-support", @@ -3582,7 +3582,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-support", "frame-system", @@ -3598,7 +3598,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-support", "frame-system", @@ -3618,7 +3618,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3634,7 +3634,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-benchmarking", "frame-support", @@ -3654,7 +3654,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-support", "frame-system", @@ -3670,7 +3670,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-support", "frame-system", @@ -3684,7 +3684,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-support", "frame-system", @@ -3699,7 +3699,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-support", "frame-system", @@ -3713,7 +3713,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-support", "frame-system", @@ -3728,7 +3728,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-benchmarking", "frame-support", @@ -3749,7 +3749,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-support", "frame-system", @@ -3764,7 +3764,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-support", "frame-system", @@ -3777,7 +3777,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "enumflags2", "frame-support", @@ -3792,7 +3792,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-benchmarking", "frame-support", @@ -3807,7 +3807,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-support", "frame-system", @@ -3827,7 +3827,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-benchmarking", "frame-support", @@ -3843,7 +3843,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-support", "frame-system", @@ -3857,7 +3857,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-benchmarking", "frame-support", @@ -3879,7 +3879,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -3890,7 +3890,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-support", "frame-system", @@ -3904,7 +3904,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-benchmarking", "frame-support", @@ -3922,7 +3922,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-support", "frame-system", @@ -3937,7 +3937,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -3955,7 +3955,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-support", "parity-scale-codec", @@ -3968,7 +3968,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-benchmarking", "frame-support", @@ -3983,7 +3983,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-benchmarking", "frame-support", @@ -3999,7 +3999,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5937,7 +5937,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "bytes 0.5.5", "derive_more 0.99.9", @@ -5964,7 +5964,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5988,7 +5988,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6005,7 +6005,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -6021,7 +6021,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -6032,7 +6032,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "ansi_term 0.12.1", "atty", @@ -6073,7 +6073,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "derive_more 0.99.9", "fnv", @@ -6109,7 +6109,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "blake2-rfc", "hash-db", @@ -6138,7 +6138,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "sc-client-api", "sp-blockchain", @@ -6149,7 +6149,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "derive_more 0.99.9", "fork-tree", @@ -6191,7 +6191,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -6215,7 +6215,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6228,7 +6228,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6251,7 +6251,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "log 0.4.8", "sc-client-api", @@ -6265,7 +6265,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "derive_more 0.99.9", "lazy_static", @@ -6293,7 +6293,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "derive_more 0.99.9", "log 0.4.8", @@ -6310,7 +6310,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6325,7 +6325,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -6346,7 +6346,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "assert_matches", "derive_more 0.99.9", @@ -6384,7 +6384,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "derive_more 0.99.9", "finality-grandpa", @@ -6401,7 +6401,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -6419,7 +6419,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "derive_more 0.99.9", "hex", @@ -6435,7 +6435,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "hash-db", "lazy_static", @@ -6454,7 +6454,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "bitflags", "bs58", @@ -6506,7 +6506,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6521,7 +6521,7 @@ dependencies = [ [[package]] name = "sc-network-test" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "env_logger", "futures 0.3.5", @@ -6548,7 +6548,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "bytes 0.5.5", "fnv", @@ -6575,7 +6575,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "futures 0.3.5", "libp2p", @@ -6588,7 +6588,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "log 0.4.8", "substrate-prometheus-endpoint", @@ -6597,7 +6597,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "futures 0.3.5", "hash-db", @@ -6629,7 +6629,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -6653,7 +6653,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -6669,7 +6669,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "derive_more 0.99.9", "directories", @@ -6731,7 +6731,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6745,7 +6745,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6766,7 +6766,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "erased-serde", "log 0.4.8", @@ -6783,7 +6783,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -6803,7 +6803,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -7229,7 +7229,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "derive_more 0.99.9", "log 0.4.8", @@ -7241,7 +7241,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "hash-db", "parity-scale-codec", @@ -7256,7 +7256,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -7268,7 +7268,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "parity-scale-codec", "serde", @@ -7280,7 +7280,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -7293,7 +7293,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "parity-scale-codec", "sp-api", @@ -7305,7 +7305,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7316,7 +7316,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "parity-scale-codec", "sp-api", @@ -7328,7 +7328,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "derive_more 0.99.9", "log 0.4.8", @@ -7345,7 +7345,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "serde", "serde_json", @@ -7354,7 +7354,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -7379,7 +7379,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "parity-scale-codec", "sp-api", @@ -7393,7 +7393,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "merlin", "parity-scale-codec", @@ -7412,7 +7412,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7421,7 +7421,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -7433,7 +7433,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "base58", "blake2-rfc", @@ -7476,7 +7476,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -7485,7 +7485,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -7495,7 +7495,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "environmental", "parity-scale-codec", @@ -7506,7 +7506,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "finality-grandpa", "log 0.4.8", @@ -7522,7 +7522,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7532,7 +7532,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "derive_more 0.99.9", "parity-scale-codec", @@ -7544,7 +7544,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "futures 0.3.5", "hash-db", @@ -7565,7 +7565,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "lazy_static", "sp-core", @@ -7576,7 +7576,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "parity-scale-codec", "serde", @@ -7588,7 +7588,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -7599,7 +7599,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "sp-api", "sp-core", @@ -7609,7 +7609,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "backtrace", "log 0.4.8", @@ -7618,7 +7618,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "serde", "sp-core", @@ -7627,7 +7627,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "either", "hash256-std-hasher", @@ -7649,7 +7649,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "parity-scale-codec", "primitive-types", @@ -7664,7 +7664,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "Inflector", "proc-macro-crate", @@ -7676,7 +7676,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "serde", "serde_json", @@ -7685,7 +7685,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "parity-scale-codec", "sp-api", @@ -7698,7 +7698,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7708,7 +7708,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "hash-db", "itertools 0.9.0", @@ -7729,12 +7729,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" [[package]] name = "sp-storage" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -7746,7 +7746,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7760,7 +7760,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "log 0.4.8", "rental", @@ -7770,7 +7770,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -7786,7 +7786,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "hash-db", "memory-db", @@ -7800,7 +7800,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "futures 0.3.5", "futures-core", @@ -7812,7 +7812,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -7824,7 +7824,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7964,7 +7964,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "chrono", "clear_on_drop", @@ -7991,7 +7991,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "platforms", ] @@ -7999,7 +7999,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -8022,7 +8022,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "async-std", "derive_more 0.99.9", @@ -8036,7 +8036,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "futures 0.1.29", "futures 0.3.5", @@ -8062,7 +8062,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "cfg-if", "frame-executive", @@ -8102,7 +8102,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" dependencies = [ "futures 0.3.5", "parity-scale-codec", @@ -8123,7 +8123,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.6" -source = "git+https://github.com/paritytech/substrate#56cf04f289f9cd5e8bb96fe5bd23a923e21acf1c" +source = "git+https://github.com/paritytech/substrate#2103bed22b22640a9aaff6bbd82a46345ad04b39" [[package]] name = "substrate-wasm-builder-runner" diff --git a/cli/src/command.rs b/cli/src/command.rs index d518b94ccf8d..04492cbb7aae 100644 --- a/cli/src/command.rs +++ b/cli/src/command.rs @@ -53,18 +53,18 @@ impl SubstrateCli for Cli { .unwrap_or("polkadot") } else { id }; Ok(match id { - "polkadot-dev" | "dev" => Box::new(service::chain_spec::polkadot_development_config()), - "polkadot-local" => Box::new(service::chain_spec::polkadot_local_testnet_config()), - "polkadot-staging" => Box::new(service::chain_spec::polkadot_staging_testnet_config()), - "kusama-dev" => Box::new(service::chain_spec::kusama_development_config()), - "kusama-local" => Box::new(service::chain_spec::kusama_local_testnet_config()), - "kusama-staging" => Box::new(service::chain_spec::kusama_staging_testnet_config()), + "polkadot-dev" | "dev" => Box::new(service::chain_spec::polkadot_development_config()?), + "polkadot-local" => Box::new(service::chain_spec::polkadot_local_testnet_config()?), + "polkadot-staging" => Box::new(service::chain_spec::polkadot_staging_testnet_config()?), + "kusama-dev" => Box::new(service::chain_spec::kusama_development_config()?), + "kusama-local" => Box::new(service::chain_spec::kusama_local_testnet_config()?), + "kusama-staging" => Box::new(service::chain_spec::kusama_staging_testnet_config()?), "polkadot" => Box::new(service::chain_spec::polkadot_config()?), "westend" => Box::new(service::chain_spec::westend_config()?), "kusama" => Box::new(service::chain_spec::kusama_config()?), - "westend-dev" => Box::new(service::chain_spec::westend_development_config()), - "westend-local" => Box::new(service::chain_spec::westend_local_testnet_config()), - "westend-staging" => Box::new(service::chain_spec::westend_staging_testnet_config()), + "westend-dev" => Box::new(service::chain_spec::westend_development_config()?), + "westend-local" => Box::new(service::chain_spec::westend_local_testnet_config()?), + "westend-staging" => Box::new(service::chain_spec::westend_staging_testnet_config()?), path if self.run.force_kusama => { Box::new(service::KusamaChainSpec::from_json_file(std::path::PathBuf::from(path))?) }, diff --git a/node/service/src/chain_spec.rs b/node/service/src/chain_spec.rs index db9d9c5dded9..63bfe636c621 100644 --- a/node/service/src/chain_spec.rs +++ b/node/service/src/chain_spec.rs @@ -113,7 +113,7 @@ fn westend_session_keys( westend::SessionKeys { babe, grandpa, im_online, parachain_validator, authority_discovery } } -fn polkadot_staging_testnet_config_genesis() -> polkadot::GenesisConfig { +fn polkadot_staging_testnet_config_genesis(wasm_binary: &[u8]) -> polkadot::GenesisConfig { // subkey inspect "$SECRET" let endowed_accounts = vec![]; @@ -132,7 +132,7 @@ fn polkadot_staging_testnet_config_genesis() -> polkadot::GenesisConfig { polkadot::GenesisConfig { system: Some(polkadot::SystemConfig { - code: polkadot::WASM_BINARY.to_vec(), + code: wasm_binary.to_vec(), changes_trie_config: Default::default(), }), balances: Some(polkadot::BalancesConfig { @@ -200,7 +200,7 @@ fn polkadot_staging_testnet_config_genesis() -> polkadot::GenesisConfig { } } -fn westend_staging_testnet_config_genesis() -> westend::GenesisConfig { +fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::GenesisConfig { // subkey inspect "$SECRET" let endowed_accounts = vec![ // 5ENpP27BrVdJTdUfY6djmcw3d3xEJ6NzSUU52CCPmGpMrdEY @@ -287,7 +287,7 @@ fn westend_staging_testnet_config_genesis() -> westend::GenesisConfig { westend::GenesisConfig { system: Some(westend::SystemConfig { - code: westend::WASM_BINARY.to_vec(), + code: wasm_binary.to_vec(), changes_trie_config: Default::default(), }), balances: Some(westend::BalancesConfig { @@ -340,7 +340,7 @@ fn westend_staging_testnet_config_genesis() -> westend::GenesisConfig { } } -fn kusama_staging_testnet_config_genesis() -> kusama::GenesisConfig { +fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisConfig { // subkey inspect "$SECRET" let endowed_accounts = vec![ // 5CVFESwfkk7NmhQ6FwHCM9roBvr9BGa4vJHFYU8DnGQxrXvz @@ -427,7 +427,7 @@ fn kusama_staging_testnet_config_genesis() -> kusama::GenesisConfig { kusama::GenesisConfig { system: Some(kusama::SystemConfig { - code: kusama::WASM_BINARY.to_vec(), + code: wasm_binary.to_vec(), changes_trie_config: Default::default(), }), balances: Some(kusama::BalancesConfig { @@ -493,54 +493,60 @@ fn kusama_staging_testnet_config_genesis() -> kusama::GenesisConfig { } /// Polkadot staging testnet config. -pub fn polkadot_staging_testnet_config() -> PolkadotChainSpec { +pub fn polkadot_staging_testnet_config() -> Result { + let wasm_binary = polkadot::WASM_BINARY.ok_or("Polkadot development wasm not available")?; let boot_nodes = vec![]; - PolkadotChainSpec::from_genesis( + + Ok(PolkadotChainSpec::from_genesis( "Polkadot Staging Testnet", "polkadot_staging_testnet", ChainType::Live, - polkadot_staging_testnet_config_genesis, + move || polkadot_staging_testnet_config_genesis(wasm_binary), boot_nodes, Some(TelemetryEndpoints::new(vec![(POLKADOT_STAGING_TELEMETRY_URL.to_string(), 0)]) .expect("Polkadot Staging telemetry url is valid; qed")), Some(DEFAULT_PROTOCOL_ID), None, Default::default(), - ) + )) } /// Staging testnet config. -pub fn kusama_staging_testnet_config() -> KusamaChainSpec { +pub fn kusama_staging_testnet_config() -> Result { + let wasm_binary = kusama::WASM_BINARY.ok_or("Kusama development wasm not available")?; let boot_nodes = vec![]; - KusamaChainSpec::from_genesis( + + Ok(KusamaChainSpec::from_genesis( "Kusama Staging Testnet", "kusama_staging_testnet", ChainType::Live, - kusama_staging_testnet_config_genesis, + move || kusama_staging_testnet_config_genesis(wasm_binary), boot_nodes, Some(TelemetryEndpoints::new(vec![(KUSAMA_STAGING_TELEMETRY_URL.to_string(), 0)]) .expect("Kusama Staging telemetry url is valid; qed")), Some(DEFAULT_PROTOCOL_ID), None, Default::default(), - ) + )) } /// Westend staging testnet config. -pub fn westend_staging_testnet_config() -> WestendChainSpec { +pub fn westend_staging_testnet_config() -> Result { + let wasm_binary = westend::WASM_BINARY.ok_or("Westend development wasm not available")?; let boot_nodes = vec![]; - WestendChainSpec::from_genesis( + + Ok(WestendChainSpec::from_genesis( "Westend Staging Testnet", "westend_staging_testnet", ChainType::Live, - westend_staging_testnet_config_genesis, + move || westend_staging_testnet_config_genesis(wasm_binary), boot_nodes, Some(TelemetryEndpoints::new(vec![(WESTEND_STAGING_TELEMETRY_URL.to_string(), 0)]) .expect("Westend Staging telemetry url is valid; qed")), Some(DEFAULT_PROTOCOL_ID), None, Default::default(), - ) + )) } /// Helper function to generate a crypto pair from seed @@ -598,6 +604,7 @@ fn testnet_accounts() -> Vec { /// Helper function to create polkadot GenesisConfig for testing pub fn polkadot_testnet_genesis( + wasm_binary: &[u8], initial_authorities: Vec<(AccountId, AccountId, BabeId, GrandpaId, ImOnlineId, ValidatorId, AuthorityDiscoveryId)>, root_key: AccountId, endowed_accounts: Option>, @@ -609,7 +616,7 @@ pub fn polkadot_testnet_genesis( polkadot::GenesisConfig { system: Some(polkadot::SystemConfig { - code: polkadot::WASM_BINARY.to_vec(), + code: wasm_binary.to_vec(), changes_trie_config: Default::default(), }), indices: Some(polkadot::IndicesConfig { @@ -675,6 +682,7 @@ pub fn polkadot_testnet_genesis( /// Helper function to create kusama GenesisConfig for testing pub fn kusama_testnet_genesis( + wasm_binary: &[u8], initial_authorities: Vec<(AccountId, AccountId, BabeId, GrandpaId, ImOnlineId, ValidatorId, AuthorityDiscoveryId)>, _root_key: AccountId, endowed_accounts: Option>, @@ -686,7 +694,7 @@ pub fn kusama_testnet_genesis( kusama::GenesisConfig { system: Some(kusama::SystemConfig { - code: kusama::WASM_BINARY.to_vec(), + code: wasm_binary.to_vec(), changes_trie_config: Default::default(), }), indices: Some(kusama::IndicesConfig { @@ -749,6 +757,7 @@ pub fn kusama_testnet_genesis( /// Helper function to create polkadot GenesisConfig for testing pub fn westend_testnet_genesis( + wasm_binary: &[u8], initial_authorities: Vec<(AccountId, AccountId, BabeId, GrandpaId, ImOnlineId, ValidatorId, AuthorityDiscoveryId)>, root_key: AccountId, endowed_accounts: Option>, @@ -760,7 +769,7 @@ pub fn westend_testnet_genesis( westend::GenesisConfig { system: Some(westend::SystemConfig { - code: westend::WASM_BINARY.to_vec(), + code: wasm_binary.to_vec(), changes_trie_config: Default::default(), }), indices: Some(westend::IndicesConfig { @@ -809,8 +818,9 @@ pub fn westend_testnet_genesis( } } -fn polkadot_development_config_genesis() -> polkadot::GenesisConfig { +fn polkadot_development_config_genesis(wasm_binary: &[u8]) -> polkadot::GenesisConfig { polkadot_testnet_genesis( + wasm_binary, vec![ get_authority_keys_from_seed("Alice"), ], @@ -819,8 +829,9 @@ fn polkadot_development_config_genesis() -> polkadot::GenesisConfig { ) } -fn kusama_development_config_genesis() -> kusama::GenesisConfig { +fn kusama_development_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisConfig { kusama_testnet_genesis( + wasm_binary, vec![ get_authority_keys_from_seed("Alice"), ], @@ -829,8 +840,9 @@ fn kusama_development_config_genesis() -> kusama::GenesisConfig { ) } -fn westend_development_config_genesis() -> westend::GenesisConfig { +fn westend_development_config_genesis(wasm_binary: &[u8]) -> westend::GenesisConfig { westend_testnet_genesis( + wasm_binary, vec![ get_authority_keys_from_seed("Alice"), ], @@ -840,52 +852,59 @@ fn westend_development_config_genesis() -> westend::GenesisConfig { } /// Polkadot development config (single validator Alice) -pub fn polkadot_development_config() -> PolkadotChainSpec { - PolkadotChainSpec::from_genesis( +pub fn polkadot_development_config() -> Result { + let wasm_binary = polkadot::WASM_BINARY.ok_or("Polkadot development wasm not available")?; + + Ok(PolkadotChainSpec::from_genesis( "Development", "dev", ChainType::Development, - polkadot_development_config_genesis, + move || polkadot_development_config_genesis(wasm_binary), vec![], None, Some(DEFAULT_PROTOCOL_ID), None, Default::default(), - ) + )) } /// Kusama development config (single validator Alice) -pub fn kusama_development_config() -> KusamaChainSpec { - KusamaChainSpec::from_genesis( +pub fn kusama_development_config() -> Result { + let wasm_binary = kusama::WASM_BINARY.ok_or("Kusama development wasm not available")?; + + Ok(KusamaChainSpec::from_genesis( "Development", "kusama_dev", ChainType::Development, - kusama_development_config_genesis, + move || kusama_development_config_genesis(wasm_binary), vec![], None, Some(DEFAULT_PROTOCOL_ID), None, Default::default(), - ) + )) } /// Westend development config (single validator Alice) -pub fn westend_development_config() -> WestendChainSpec { - WestendChainSpec::from_genesis( +pub fn westend_development_config() -> Result { + let wasm_binary = westend::WASM_BINARY.ok_or("Westend development wasm not available")?; + + Ok(WestendChainSpec::from_genesis( "Development", "westend_dev", ChainType::Development, - westend_development_config_genesis, + move || westend_development_config_genesis(wasm_binary), vec![], None, Some(DEFAULT_PROTOCOL_ID), None, Default::default(), - ) + )) } -fn polkadot_local_testnet_genesis() -> polkadot::GenesisConfig { +fn polkadot_local_testnet_genesis(wasm_binary: &[u8]) -> polkadot::GenesisConfig { polkadot_testnet_genesis( + wasm_binary, vec![ get_authority_keys_from_seed("Alice"), get_authority_keys_from_seed("Bob"), @@ -896,22 +915,25 @@ fn polkadot_local_testnet_genesis() -> polkadot::GenesisConfig { } /// Polkadot local testnet config (multivalidator Alice + Bob) -pub fn polkadot_local_testnet_config() -> PolkadotChainSpec { - PolkadotChainSpec::from_genesis( +pub fn polkadot_local_testnet_config() -> Result { + let wasm_binary = polkadot::WASM_BINARY.ok_or("Polkadot development wasm not available")?; + + Ok(PolkadotChainSpec::from_genesis( "Local Testnet", "local_testnet", ChainType::Local, - polkadot_local_testnet_genesis, + move || polkadot_local_testnet_genesis(wasm_binary), vec![], None, Some(DEFAULT_PROTOCOL_ID), None, Default::default(), - ) + )) } -fn kusama_local_testnet_genesis() -> kusama::GenesisConfig { +fn kusama_local_testnet_genesis(wasm_binary: &[u8]) -> kusama::GenesisConfig { kusama_testnet_genesis( + wasm_binary, vec![ get_authority_keys_from_seed("Alice"), get_authority_keys_from_seed("Bob"), @@ -922,22 +944,25 @@ fn kusama_local_testnet_genesis() -> kusama::GenesisConfig { } /// Kusama local testnet config (multivalidator Alice + Bob) -pub fn kusama_local_testnet_config() -> KusamaChainSpec { - KusamaChainSpec::from_genesis( +pub fn kusama_local_testnet_config() -> Result { + let wasm_binary = kusama::WASM_BINARY.ok_or("Kusama development wasm not available")?; + + Ok(KusamaChainSpec::from_genesis( "Kusama Local Testnet", "kusama_local_testnet", ChainType::Local, - kusama_local_testnet_genesis, + move || kusama_local_testnet_genesis(wasm_binary), vec![], None, Some(DEFAULT_PROTOCOL_ID), None, Default::default(), - ) + )) } -fn westend_local_testnet_genesis() -> westend::GenesisConfig { +fn westend_local_testnet_genesis(wasm_binary: &[u8]) -> westend::GenesisConfig { westend_testnet_genesis( + wasm_binary, vec![ get_authority_keys_from_seed("Alice"), get_authority_keys_from_seed("Bob"), @@ -948,16 +973,18 @@ fn westend_local_testnet_genesis() -> westend::GenesisConfig { } /// Westend local testnet config (multivalidator Alice + Bob) -pub fn westend_local_testnet_config() -> WestendChainSpec { - WestendChainSpec::from_genesis( +pub fn westend_local_testnet_config() -> Result { + let wasm_binary = westend::WASM_BINARY.ok_or("Westend development wasm not available")?; + + Ok(WestendChainSpec::from_genesis( "Westend Local Testnet", "westend_local_testnet", ChainType::Local, - westend_local_testnet_genesis, + move || westend_local_testnet_genesis(wasm_binary), vec![], None, Some(DEFAULT_PROTOCOL_ID), None, Default::default(), - ) + )) } diff --git a/node/test-service/src/chain_spec.rs b/node/test-service/src/chain_spec.rs index e81050afdbbe..67d1667469b8 100644 --- a/node/test-service/src/chain_spec.rs +++ b/node/test-service/src/chain_spec.rs @@ -107,7 +107,7 @@ fn polkadot_testnet_genesis( polkadot::GenesisConfig { system: Some(polkadot::SystemConfig { - code: polkadot::WASM_BINARY.to_vec(), + code: polkadot::WASM_BINARY.expect("Wasm binary must be built for testing").to_vec(), changes_trie_config, }), indices: Some(polkadot::IndicesConfig { indices: vec![] }), diff --git a/parachain/test-parachains/adder/src/lib.rs b/parachain/test-parachains/adder/src/lib.rs index d910eb0fc1af..7ccba8400efb 100644 --- a/parachain/test-parachains/adder/src/lib.rs +++ b/parachain/test-parachains/adder/src/lib.rs @@ -33,6 +33,13 @@ static ALLOC: dlmalloc::GlobalDlmalloc = dlmalloc::GlobalDlmalloc; #[cfg(feature = "std")] include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); +#[cfg(feature = "std")] +/// Wasm binary unwrapped. If built with `BUILD_DUMMY_WASM_BINARY`, the function panics. +pub fn wasm_binary_unwrap() -> &'static [u8] { + WASM_BINARY.expect("Development wasm binary is not available. Testing is only \ + supported with the flag disabled.") +} + /// Head data for this parachain. #[derive(Default, Clone, Hash, Eq, PartialEq, Encode, Decode)] pub struct HeadData { diff --git a/parachain/test-parachains/code-upgrader/src/lib.rs b/parachain/test-parachains/code-upgrader/src/lib.rs index 4a717af0084c..c0219e0229a8 100644 --- a/parachain/test-parachains/code-upgrader/src/lib.rs +++ b/parachain/test-parachains/code-upgrader/src/lib.rs @@ -34,6 +34,13 @@ static ALLOC: dlmalloc::GlobalDlmalloc = dlmalloc::GlobalDlmalloc; #[cfg(feature = "std")] include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); +#[cfg(feature = "std")] +/// Wasm binary unwrapped. If built with `BUILD_DUMMY_WASM_BINARY`, the function panics. +pub fn wasm_binary_unwrap() -> &'static [u8] { + WASM_BINARY.expect("Development wasm binary is not available. Testing is only \ + supported with the flag disabled.") +} + #[derive(Encode, Decode, Clone, Default)] pub struct State { /// The current code that is "active" in this chain. diff --git a/parachain/test-parachains/halt/src/lib.rs b/parachain/test-parachains/halt/src/lib.rs index fe2778ae783b..b82a649e3f1e 100644 --- a/parachain/test-parachains/halt/src/lib.rs +++ b/parachain/test-parachains/halt/src/lib.rs @@ -23,6 +23,13 @@ #[cfg(feature = "std")] include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); +#[cfg(feature = "std")] +/// Wasm binary unwrapped. If built with `BUILD_DUMMY_WASM_BINARY`, the function panics. +pub fn wasm_binary_unwrap() -> &'static [u8] { + WASM_BINARY.expect("Development wasm binary is not available. Testing is only \ + supported with the flag disabled.") +} + #[cfg(not(feature = "std"))] #[panic_handler] #[no_mangle] @@ -46,4 +53,3 @@ pub fn oom(_: core::alloc::Layout) -> ! { pub extern fn validate_block(params: *const u8, len: usize) -> usize { loop {} } - diff --git a/parachain/test-parachains/tests/adder/mod.rs b/parachain/test-parachains/tests/adder/mod.rs index b0b53dc4dc6a..373eace15cac 100644 --- a/parachain/test-parachains/tests/adder/mod.rs +++ b/parachain/test-parachains/tests/adder/mod.rs @@ -44,8 +44,6 @@ struct BlockData { add: u64, } -const TEST_CODE: &[u8] = adder::WASM_BINARY; - fn hash_state(state: u64) -> [u8; 32] { tiny_keccak::keccak256(state.encode().as_slice()) } @@ -70,7 +68,7 @@ pub fn execute_good_on_parent() { let pool = parachain::wasm_executor::ValidationPool::new(); let ret = parachain::wasm_executor::validate_candidate( - TEST_CODE, + adder::wasm_binary_unwrap(), ValidationParams { parent_head: GenericHeadData(parent_head.encode()), block_data: GenericBlockData(block_data.encode()), @@ -109,7 +107,7 @@ fn execute_good_chain_on_parent() { }; let ret = parachain::wasm_executor::validate_candidate( - TEST_CODE, + adder::wasm_binary_unwrap(), ValidationParams { parent_head: GenericHeadData(parent_head.encode()), block_data: GenericBlockData(block_data.encode()), @@ -149,7 +147,7 @@ fn execute_bad_on_parent() { }; let _ret = parachain::wasm_executor::validate_candidate( - TEST_CODE, + adder::wasm_binary_unwrap(), ValidationParams { parent_head: GenericHeadData(parent_head.encode()), block_data: GenericBlockData(block_data.encode()), diff --git a/parachain/test-parachains/tests/code_upgrader/mod.rs b/parachain/test-parachains/tests/code_upgrader/mod.rs index 89f6065cf178..27b164f90c28 100644 --- a/parachain/test-parachains/tests/code_upgrader/mod.rs +++ b/parachain/test-parachains/tests/code_upgrader/mod.rs @@ -24,8 +24,6 @@ use parachain::primitives::{ use codec::{Decode, Encode}; use code_upgrader::{hash_state, HeadData, BlockData, State}; -const TEST_CODE: &[u8] = code_upgrader::WASM_BINARY; - #[test] pub fn execute_good_no_upgrade() { let pool = parachain::wasm_executor::ValidationPool::new(); @@ -42,7 +40,7 @@ pub fn execute_good_no_upgrade() { }; let ret = parachain::wasm_executor::validate_candidate( - TEST_CODE, + code_upgrader::wasm_binary_unwrap(), ValidationParams { parent_head: GenericHeadData(parent_head.encode()), block_data: GenericBlockData(block_data.encode()), @@ -78,7 +76,7 @@ pub fn execute_good_with_upgrade() { }; let ret = parachain::wasm_executor::validate_candidate( - TEST_CODE, + code_upgrader::wasm_binary_unwrap(), ValidationParams { parent_head: GenericHeadData(parent_head.encode()), block_data: GenericBlockData(block_data.encode()), @@ -121,7 +119,7 @@ pub fn code_upgrade_not_allowed() { }; parachain::wasm_executor::validate_candidate( - TEST_CODE, + code_upgrader::wasm_binary_unwrap(), ValidationParams { parent_head: GenericHeadData(parent_head.encode()), block_data: GenericBlockData(block_data.encode()), @@ -151,7 +149,7 @@ pub fn applies_code_upgrade_after_delay() { }; let ret = parachain::wasm_executor::validate_candidate( - TEST_CODE, + code_upgrader::wasm_binary_unwrap(), ValidationParams { parent_head: GenericHeadData(parent_head.encode()), block_data: GenericBlockData(block_data.encode()), @@ -186,7 +184,7 @@ pub fn applies_code_upgrade_after_delay() { }; let ret = parachain::wasm_executor::validate_candidate( - TEST_CODE, + code_upgrader::wasm_binary_unwrap(), ValidationParams { parent_head: GenericHeadData(parent_head.encode()), block_data: GenericBlockData(block_data.encode()), diff --git a/parachain/test-parachains/tests/wasm_executor/mod.rs b/parachain/test-parachains/tests/wasm_executor/mod.rs index 6ba8ddefec8d..864b9a4ea724 100644 --- a/parachain/test-parachains/tests/wasm_executor/mod.rs +++ b/parachain/test-parachains/tests/wasm_executor/mod.rs @@ -22,15 +22,12 @@ use parachain::{ wasm_executor::EXECUTION_TIMEOUT_SEC, }; -// Code that exposes `validate_block` and loops infinitely -const INFINITE_LOOP_CODE: &[u8] = halt::WASM_BINARY; - #[test] fn terminates_on_timeout() { let pool = parachain::wasm_executor::ValidationPool::new(); let result = parachain::wasm_executor::validate_candidate( - INFINITE_LOOP_CODE, + halt::wasm_binary_unwrap(), ValidationParams { block_data: BlockData(Vec::new()), parent_head: Default::default(), @@ -59,7 +56,7 @@ fn parallel_execution() { let pool2 = pool.clone(); let thread = std::thread::spawn(move || parachain::wasm_executor::validate_candidate( - INFINITE_LOOP_CODE, + halt::wasm_binary_unwrap(), ValidationParams { block_data: BlockData(Vec::new()), parent_head: Default::default(), @@ -71,7 +68,7 @@ fn parallel_execution() { parachain::wasm_executor::ExecutionMode::RemoteTest(&pool2), ).ok()); let _ = parachain::wasm_executor::validate_candidate( - INFINITE_LOOP_CODE, + halt::wasm_binary_unwrap(), ValidationParams { block_data: BlockData(Vec::new()), parent_head: Default::default(), diff --git a/service/src/chain_spec.rs b/service/src/chain_spec.rs index fe8d98d0553f..9d870ca543a7 100644 --- a/service/src/chain_spec.rs +++ b/service/src/chain_spec.rs @@ -113,7 +113,7 @@ fn westend_session_keys( westend::SessionKeys { babe, grandpa, im_online, parachain_validator, authority_discovery } } -fn polkadot_staging_testnet_config_genesis() -> polkadot::GenesisConfig { +fn polkadot_staging_testnet_config_genesis(wasm_binary: &[u8]) -> polkadot::GenesisConfig { // subkey inspect "$SECRET" let endowed_accounts = vec![]; @@ -132,7 +132,7 @@ fn polkadot_staging_testnet_config_genesis() -> polkadot::GenesisConfig { polkadot::GenesisConfig { system: Some(polkadot::SystemConfig { - code: polkadot::WASM_BINARY.to_vec(), + code: wasm_binary.to_vec(), changes_trie_config: Default::default(), }), balances: Some(polkadot::BalancesConfig { @@ -200,7 +200,7 @@ fn polkadot_staging_testnet_config_genesis() -> polkadot::GenesisConfig { } } -fn westend_staging_testnet_config_genesis() -> westend::GenesisConfig { +fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::GenesisConfig { // subkey inspect "$SECRET" let endowed_accounts = vec![ // 5ENpP27BrVdJTdUfY6djmcw3d3xEJ6NzSUU52CCPmGpMrdEY @@ -287,7 +287,7 @@ fn westend_staging_testnet_config_genesis() -> westend::GenesisConfig { westend::GenesisConfig { system: Some(westend::SystemConfig { - code: westend::WASM_BINARY.to_vec(), + code: wasm_binary.to_vec(), changes_trie_config: Default::default(), }), balances: Some(westend::BalancesConfig { @@ -340,7 +340,7 @@ fn westend_staging_testnet_config_genesis() -> westend::GenesisConfig { } } -fn kusama_staging_testnet_config_genesis() -> kusama::GenesisConfig { +fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisConfig { // subkey inspect "$SECRET" let endowed_accounts = vec![ // 5CVFESwfkk7NmhQ6FwHCM9roBvr9BGa4vJHFYU8DnGQxrXvz @@ -427,7 +427,7 @@ fn kusama_staging_testnet_config_genesis() -> kusama::GenesisConfig { kusama::GenesisConfig { system: Some(kusama::SystemConfig { - code: kusama::WASM_BINARY.to_vec(), + code: wasm_binary.to_vec(), changes_trie_config: Default::default(), }), balances: Some(kusama::BalancesConfig { @@ -493,54 +493,60 @@ fn kusama_staging_testnet_config_genesis() -> kusama::GenesisConfig { } /// Polkadot staging testnet config. -pub fn polkadot_staging_testnet_config() -> PolkadotChainSpec { +pub fn polkadot_staging_testnet_config() -> Result { + let wasm_binary = polkadot::WASM_BINARY.ok_or("Polkadot development wasm not available")?; let boot_nodes = vec![]; - PolkadotChainSpec::from_genesis( + + Ok(PolkadotChainSpec::from_genesis( "Polkadot Staging Testnet", "polkadot_staging_testnet", ChainType::Live, - polkadot_staging_testnet_config_genesis, + move || polkadot_staging_testnet_config_genesis(wasm_binary), boot_nodes, Some(TelemetryEndpoints::new(vec![(POLKADOT_STAGING_TELEMETRY_URL.to_string(), 0)]) .expect("Polkadot Staging telemetry url is valid; qed")), Some(DEFAULT_PROTOCOL_ID), None, Default::default(), - ) + )) } /// Staging testnet config. -pub fn kusama_staging_testnet_config() -> KusamaChainSpec { +pub fn kusama_staging_testnet_config() -> Result { + let wasm_binary = kusama::WASM_BINARY.ok_or("Kusama development wasm not available")?; let boot_nodes = vec![]; - KusamaChainSpec::from_genesis( + + Ok(KusamaChainSpec::from_genesis( "Kusama Staging Testnet", "kusama_staging_testnet", ChainType::Live, - kusama_staging_testnet_config_genesis, + move || kusama_staging_testnet_config_genesis(wasm_binary), boot_nodes, Some(TelemetryEndpoints::new(vec![(KUSAMA_STAGING_TELEMETRY_URL.to_string(), 0)]) .expect("Kusama Staging telemetry url is valid; qed")), Some(DEFAULT_PROTOCOL_ID), None, Default::default(), - ) + )) } /// Westend staging testnet config. -pub fn westend_staging_testnet_config() -> WestendChainSpec { +pub fn westend_staging_testnet_config() -> Result { + let wasm_binary = westend::WASM_BINARY.ok_or("Westend development wasm not available")?; let boot_nodes = vec![]; - WestendChainSpec::from_genesis( + + Ok(WestendChainSpec::from_genesis( "Westend Staging Testnet", "westend_staging_testnet", ChainType::Live, - westend_staging_testnet_config_genesis, + move || westend_staging_testnet_config_genesis(wasm_binary), boot_nodes, Some(TelemetryEndpoints::new(vec![(WESTEND_STAGING_TELEMETRY_URL.to_string(), 0)]) .expect("Westend Staging telemetry url is valid; qed")), Some(DEFAULT_PROTOCOL_ID), None, Default::default(), - ) + )) } /// Helper function to generate a crypto pair from seed @@ -598,6 +604,7 @@ fn testnet_accounts() -> Vec { /// Helper function to create polkadot GenesisConfig for testing pub fn polkadot_testnet_genesis( + wasm_binary: &[u8], initial_authorities: Vec<(AccountId, AccountId, BabeId, GrandpaId, ImOnlineId, ValidatorId, AuthorityDiscoveryId)>, root_key: AccountId, endowed_accounts: Option>, @@ -609,7 +616,7 @@ pub fn polkadot_testnet_genesis( polkadot::GenesisConfig { system: Some(polkadot::SystemConfig { - code: polkadot::WASM_BINARY.to_vec(), + code: wasm_binary.to_vec(), changes_trie_config: Default::default(), }), indices: Some(polkadot::IndicesConfig { @@ -675,6 +682,7 @@ pub fn polkadot_testnet_genesis( /// Helper function to create kusama GenesisConfig for testing pub fn kusama_testnet_genesis( + wasm_binary: &[u8], initial_authorities: Vec<(AccountId, AccountId, BabeId, GrandpaId, ImOnlineId, ValidatorId, AuthorityDiscoveryId)>, _root_key: AccountId, endowed_accounts: Option>, @@ -686,7 +694,7 @@ pub fn kusama_testnet_genesis( kusama::GenesisConfig { system: Some(kusama::SystemConfig { - code: kusama::WASM_BINARY.to_vec(), + code: wasm_binary.to_vec(), changes_trie_config: Default::default(), }), indices: Some(kusama::IndicesConfig { @@ -749,6 +757,7 @@ pub fn kusama_testnet_genesis( /// Helper function to create polkadot GenesisConfig for testing pub fn westend_testnet_genesis( + wasm_binary: &[u8], initial_authorities: Vec<(AccountId, AccountId, BabeId, GrandpaId, ImOnlineId, ValidatorId, AuthorityDiscoveryId)>, root_key: AccountId, endowed_accounts: Option>, @@ -760,7 +769,7 @@ pub fn westend_testnet_genesis( westend::GenesisConfig { system: Some(westend::SystemConfig { - code: westend::WASM_BINARY.to_vec(), + code: wasm_binary.to_vec(), changes_trie_config: Default::default(), }), indices: Some(westend::IndicesConfig { @@ -809,8 +818,9 @@ pub fn westend_testnet_genesis( } } -fn polkadot_development_config_genesis() -> polkadot::GenesisConfig { +fn polkadot_development_config_genesis(wasm_binary: &[u8]) -> polkadot::GenesisConfig { polkadot_testnet_genesis( + wasm_binary, vec![ get_authority_keys_from_seed("Alice"), ], @@ -819,8 +829,9 @@ fn polkadot_development_config_genesis() -> polkadot::GenesisConfig { ) } -fn kusama_development_config_genesis() -> kusama::GenesisConfig { +fn kusama_development_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisConfig { kusama_testnet_genesis( + wasm_binary, vec![ get_authority_keys_from_seed("Alice"), ], @@ -829,8 +840,9 @@ fn kusama_development_config_genesis() -> kusama::GenesisConfig { ) } -fn westend_development_config_genesis() -> westend::GenesisConfig { +fn westend_development_config_genesis(wasm_binary: &[u8]) -> westend::GenesisConfig { westend_testnet_genesis( + wasm_binary, vec![ get_authority_keys_from_seed("Alice"), ], @@ -840,52 +852,59 @@ fn westend_development_config_genesis() -> westend::GenesisConfig { } /// Polkadot development config (single validator Alice) -pub fn polkadot_development_config() -> PolkadotChainSpec { - PolkadotChainSpec::from_genesis( +pub fn polkadot_development_config() -> Result { + let wasm_binary = polkadot::WASM_BINARY.ok_or("Polkadot development wasm not available")?; + + Ok(PolkadotChainSpec::from_genesis( "Development", "dev", ChainType::Development, - polkadot_development_config_genesis, + move || polkadot_development_config_genesis(wasm_binary), vec![], None, Some(DEFAULT_PROTOCOL_ID), None, Default::default(), - ) + )) } /// Kusama development config (single validator Alice) -pub fn kusama_development_config() -> KusamaChainSpec { - KusamaChainSpec::from_genesis( +pub fn kusama_development_config() -> Result { + let wasm_binary = kusama::WASM_BINARY.ok_or("Kusama development wasm not available")?; + + Ok(KusamaChainSpec::from_genesis( "Development", "kusama_dev", ChainType::Development, - kusama_development_config_genesis, + move || kusama_development_config_genesis(wasm_binary), vec![], None, Some(DEFAULT_PROTOCOL_ID), None, Default::default(), - ) + )) } /// Westend development config (single validator Alice) -pub fn westend_development_config() -> WestendChainSpec { - WestendChainSpec::from_genesis( +pub fn westend_development_config() -> Result { + let wasm_binary = westend::WASM_BINARY.ok_or("Westend development wasm not available")?; + + Ok(WestendChainSpec::from_genesis( "Development", "westend_dev", ChainType::Development, - westend_development_config_genesis, + move || westend_development_config_genesis(wasm_binary), vec![], None, Some(DEFAULT_PROTOCOL_ID), None, Default::default(), - ) + )) } -fn polkadot_local_testnet_genesis() -> polkadot::GenesisConfig { +fn polkadot_local_testnet_genesis(wasm_binary: &[u8]) -> polkadot::GenesisConfig { polkadot_testnet_genesis( + wasm_binary, vec![ get_authority_keys_from_seed("Alice"), get_authority_keys_from_seed("Bob"), @@ -896,22 +915,25 @@ fn polkadot_local_testnet_genesis() -> polkadot::GenesisConfig { } /// Polkadot local testnet config (multivalidator Alice + Bob) -pub fn polkadot_local_testnet_config() -> PolkadotChainSpec { - PolkadotChainSpec::from_genesis( +pub fn polkadot_local_testnet_config() -> Result { + let wasm_binary = polkadot::WASM_BINARY.ok_or("Polkadot development wasm not available")?; + + Ok(PolkadotChainSpec::from_genesis( "Local Testnet", "local_testnet", ChainType::Local, - polkadot_local_testnet_genesis, + move || polkadot_local_testnet_genesis(wasm_binary), vec![], None, Some(DEFAULT_PROTOCOL_ID), None, Default::default(), - ) + )) } -fn kusama_local_testnet_genesis() -> kusama::GenesisConfig { +fn kusama_local_testnet_genesis(wasm_binary: &[u8]) -> kusama::GenesisConfig { kusama_testnet_genesis( + wasm_binary, vec![ get_authority_keys_from_seed("Alice"), get_authority_keys_from_seed("Bob"), @@ -922,22 +944,25 @@ fn kusama_local_testnet_genesis() -> kusama::GenesisConfig { } /// Kusama local testnet config (multivalidator Alice + Bob) -pub fn kusama_local_testnet_config() -> KusamaChainSpec { - KusamaChainSpec::from_genesis( +pub fn kusama_local_testnet_config() -> Result { + let wasm_binary = kusama::WASM_BINARY.ok_or("Kusama development wasm not available")?; + + Ok(KusamaChainSpec::from_genesis( "Kusama Local Testnet", "kusama_local_testnet", ChainType::Local, - kusama_local_testnet_genesis, + move || kusama_local_testnet_genesis(wasm_binary), vec![], None, Some(DEFAULT_PROTOCOL_ID), None, Default::default(), - ) + )) } -fn westend_local_testnet_genesis() -> westend::GenesisConfig { +fn westend_local_testnet_genesis(wasm_binary: &[u8]) -> westend::GenesisConfig { westend_testnet_genesis( + wasm_binary, vec![ get_authority_keys_from_seed("Alice"), get_authority_keys_from_seed("Bob"), @@ -948,16 +973,18 @@ fn westend_local_testnet_genesis() -> westend::GenesisConfig { } /// Westend local testnet config (multivalidator Alice + Bob) -pub fn westend_local_testnet_config() -> WestendChainSpec { - WestendChainSpec::from_genesis( +pub fn westend_local_testnet_config() -> Result { + let wasm_binary = westend::WASM_BINARY.ok_or("Westend development wasm not available")?; + + Ok(WestendChainSpec::from_genesis( "Westend Local Testnet", "westend_local_testnet", ChainType::Local, - westend_local_testnet_genesis, + move || westend_local_testnet_genesis(wasm_binary), vec![], None, Some(DEFAULT_PROTOCOL_ID), None, Default::default(), - ) + )) } From ce8fb6b1bad6eb4eaca7ccae40670808033c24b1 Mon Sep 17 00:00:00 2001 From: Wei Tang Date: Wed, 22 Jul 2020 20:26:38 +0000 Subject: [PATCH 3/4] Update cargo lock --- Cargo.lock | 583 ++++++++++++++++++++++++----------------------------- 1 file changed, 269 insertions(+), 314 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1aa1be64918b..f656239de95e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -637,15 +637,6 @@ dependencies = [ "vec_map", ] -[[package]] -name = "clear_on_drop" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9cc5db465b294c3fa986d5bbb0f3017cd850bff6dd6c52f9ccff8b4d21b7b08" -dependencies = [ - "cc", -] - [[package]] name = "cloudabi" version = "0.0.3" @@ -734,25 +725,23 @@ checksum = "6d375c433320f6c5057ae04a04376eef4d04ce2801448cf8863a78da99107be4" [[package]] name = "cranelift-bforest" -version = "0.63.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4425bb6c3f3d2f581c650f1a1fdd3196a975490149cf59bea9d34c3bea79eda" +version = "0.66.0" +source = "git+https://github.com/paritytech/wasmtime?branch=update-upstream#f744c4e564b40a4cfce6a7090f093ec1726c68e9" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.63.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d166b289fd30062ee6de86284750fc3fe5d037c6b864b3326ce153239b0626e1" +version = "0.66.0" +source = "git+https://github.com/paritytech/wasmtime?branch=update-upstream#f744c4e564b40a4cfce6a7090f093ec1726c68e9" dependencies = [ "byteorder", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", - "gimli 0.20.0", + "gimli 0.21.0", "log 0.4.8", "regalloc", "serde", @@ -763,9 +752,8 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.63.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c9fb2306a36d41c5facd4bf3400bc6c157185c43a96eaaa503471c34c5144b" +version = "0.66.0" +source = "git+https://github.com/paritytech/wasmtime?branch=update-upstream#f744c4e564b40a4cfce6a7090f093ec1726c68e9" dependencies = [ "cranelift-codegen-shared", "cranelift-entity", @@ -773,24 +761,21 @@ dependencies = [ [[package]] name = "cranelift-codegen-shared" -version = "0.63.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44e0cfe9b1f97d9f836bca551618106c7d53b93b579029ecd38e73daa7eb689e" +version = "0.66.0" +source = "git+https://github.com/paritytech/wasmtime?branch=update-upstream#f744c4e564b40a4cfce6a7090f093ec1726c68e9" [[package]] name = "cranelift-entity" -version = "0.63.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "926a73c432e5ba9c891171ff50b75e7d992cd76cd271f0a0a0ba199138077472" +version = "0.66.0" +source = "git+https://github.com/paritytech/wasmtime?branch=update-upstream#f744c4e564b40a4cfce6a7090f093ec1726c68e9" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.63.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e45f82e3446dd1ebb8c2c2f6a6b0e6cd6cd52965c7e5f7b1b35e9a9ace31ccde" +version = "0.66.0" +source = "git+https://github.com/paritytech/wasmtime?branch=update-upstream#f744c4e564b40a4cfce6a7090f093ec1726c68e9" dependencies = [ "cranelift-codegen", "log 0.4.8", @@ -800,9 +785,8 @@ dependencies = [ [[package]] name = "cranelift-native" -version = "0.63.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488b5d481bb0996a143e55a9d1739ef425efa20d4a5e5e98c859a8573c9ead9a" +version = "0.66.0" +source = "git+https://github.com/paritytech/wasmtime?branch=update-upstream#f744c4e564b40a4cfce6a7090f093ec1726c68e9" dependencies = [ "cranelift-codegen", "raw-cpuid", @@ -811,9 +795,8 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.63.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00aa8dde71fd9fdb1958e7b0ef8f524c1560e2c6165e4ea54bc302b40551c161" +version = "0.66.0" +source = "git+https://github.com/paritytech/wasmtime?branch=update-upstream#f744c4e564b40a4cfce6a7090f093ec1726c68e9" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -821,7 +804,7 @@ dependencies = [ "log 0.4.8", "serde", "thiserror", - "wasmparser 0.51.4", + "wasmparser 0.59.0", ] [[package]] @@ -1181,21 +1164,6 @@ dependencies = [ "futures 0.3.5", ] -[[package]] -name = "faerie" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfef65b0e94693295c5d2fe2506f0ee6f43465342d4b5331659936aee8b16084" -dependencies = [ - "goblin", - "indexmap", - "log 0.4.8", - "scroll", - "string-interner", - "target-lexicon", - "thiserror", -] - [[package]] name = "failure" version = "0.1.8" @@ -1325,7 +1293,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "parity-scale-codec", ] @@ -1333,7 +1301,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-support", "frame-system", @@ -1350,7 +1318,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "Inflector", "frame-benchmarking", @@ -1369,7 +1337,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-support", "frame-system", @@ -1384,7 +1352,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "parity-scale-codec", "serde", @@ -1395,7 +1363,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "bitmask", "frame-metadata", @@ -1420,7 +1388,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.18", @@ -1431,7 +1399,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1443,7 +1411,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -1453,7 +1421,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1469,7 +1437,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-benchmarking", "frame-support", @@ -1483,7 +1451,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "parity-scale-codec", "sp-api", @@ -1796,15 +1764,12 @@ dependencies = [ [[package]] name = "gimli" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dd6190aad0f05ddbbf3245c54ed14ca4aa6dd32f22312b70d8f168c3e3e633" +checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c" dependencies = [ - "arrayvec 0.5.1", - "byteorder", "fallible-iterator", "indexmap", - "smallvec 1.4.1", "stable_deref_trait", ] @@ -1846,17 +1811,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "goblin" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081214398d39e4bd7f2c1975f0488ed04614ffdd976c6fc7a0708278552c0da" -dependencies = [ - "log 0.4.8", - "plain", - "scroll", -] - [[package]] name = "h2" version = "0.1.26" @@ -2191,6 +2145,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c398b2b113b55809ceb9ee3e753fcbac793f1956663f3c36549c1346015c2afe" dependencies = [ "autocfg 1.0.0", + "serde", ] [[package]] @@ -3426,18 +3381,20 @@ dependencies = [ [[package]] name = "object" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5666bbb90bc4d1e5bdcb26c0afda1822d25928341e9384ab187a9b37ab69e36" -dependencies = [ - "target-lexicon", -] +checksum = "9cbca9424c482ee628fa549d9c812e2cd22f1180b9222c9200fdfa6eb31aecb2" [[package]] name = "object" version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" +dependencies = [ + "crc32fast", + "indexmap", + "wasmparser 0.57.0", +] [[package]] name = "once_cell" @@ -3478,7 +3435,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-support", "frame-system", @@ -3494,7 +3451,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-support", "frame-system", @@ -3509,7 +3466,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-benchmarking", "frame-support", @@ -3534,7 +3491,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-benchmarking", "frame-support", @@ -3548,7 +3505,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-benchmarking", "frame-support", @@ -3564,7 +3521,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-benchmarking", "frame-support", @@ -3579,7 +3536,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-benchmarking", "frame-support", @@ -3594,7 +3551,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-support", "frame-system", @@ -3610,7 +3567,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-benchmarking", "frame-support", @@ -3632,7 +3589,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3648,7 +3605,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-benchmarking", "frame-support", @@ -3668,7 +3625,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-support", "frame-system", @@ -3684,7 +3641,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-support", "frame-system", @@ -3698,7 +3655,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-support", "frame-system", @@ -3713,7 +3670,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-support", "frame-system", @@ -3727,7 +3684,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-support", "frame-system", @@ -3742,7 +3699,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-benchmarking", "frame-support", @@ -3763,7 +3720,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-support", "frame-system", @@ -3778,7 +3735,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-support", "frame-system", @@ -3791,7 +3748,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "enumflags2", "frame-support", @@ -3806,7 +3763,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-benchmarking", "frame-support", @@ -3821,7 +3778,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-support", "frame-system", @@ -3841,7 +3798,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-benchmarking", "frame-support", @@ -3857,7 +3814,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-support", "frame-system", @@ -3871,7 +3828,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-benchmarking", "frame-support", @@ -3893,7 +3850,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -3904,7 +3861,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-support", "frame-system", @@ -3918,7 +3875,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-benchmarking", "frame-support", @@ -3936,7 +3893,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-support", "frame-system", @@ -3953,7 +3910,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -3971,7 +3928,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-support", "parity-scale-codec", @@ -3984,7 +3941,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-benchmarking", "frame-support", @@ -3999,7 +3956,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4015,7 +3972,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4300,12 +4257,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" -[[package]] -name = "plain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" - [[package]] name = "platforms" version = "0.2.1" @@ -5731,9 +5682,9 @@ dependencies = [ [[package]] name = "regalloc" -version = "0.0.21" +version = "0.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b27b256b41986ac5141b37b8bbba85d314fbf546c182eb255af6720e07e4f804" +checksum = "3598bed0895fe0f72a9e0b00ef9e3a3c8af978a8401b2f2046dec5927de6364a" dependencies = [ "log 0.4.8", "rustc-hash", @@ -5946,7 +5897,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "bytes 0.5.5", "derive_more 0.99.9", @@ -5973,7 +5924,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5997,7 +5948,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6014,7 +5965,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -6030,7 +5981,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -6041,7 +5992,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "ansi_term 0.12.1", "atty", @@ -6082,7 +6033,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "derive_more 0.99.9", "fnv", @@ -6118,7 +6069,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "blake2-rfc", "hash-db", @@ -6147,7 +6098,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "sc-client-api", "sp-blockchain", @@ -6158,7 +6109,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "derive_more 0.99.9", "fork-tree", @@ -6200,7 +6151,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -6224,7 +6175,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6237,7 +6188,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6260,7 +6211,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "log 0.4.8", "sc-client-api", @@ -6274,7 +6225,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "derive_more 0.99.9", "lazy_static", @@ -6302,7 +6253,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "derive_more 0.99.9", "log 0.4.8", @@ -6319,7 +6270,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6334,7 +6285,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -6348,14 +6299,14 @@ dependencies = [ "sp-runtime-interface", "sp-wasm-interface", "substrate-wasmtime", - "substrate-wasmtime-runtime", "wasmtime-environ", + "wasmtime-runtime", ] [[package]] name = "sc-finality-grandpa" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "assert_matches", "derive_more 0.99.9", @@ -6393,7 +6344,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "derive_more 0.99.9", "finality-grandpa", @@ -6410,7 +6361,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -6428,7 +6379,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "derive_more 0.99.9", "hex", @@ -6444,7 +6395,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "hash-db", "lazy_static", @@ -6463,7 +6414,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "bitflags", "bs58", @@ -6515,7 +6466,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6530,7 +6481,7 @@ dependencies = [ [[package]] name = "sc-network-test" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "env_logger", "futures 0.3.5", @@ -6557,7 +6508,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "bytes 0.5.5", "fnv", @@ -6584,7 +6535,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "futures 0.3.5", "libp2p", @@ -6597,7 +6548,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "log 0.4.8", "substrate-prometheus-endpoint", @@ -6606,7 +6557,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "futures 0.3.5", "hash-db", @@ -6638,7 +6589,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -6662,7 +6613,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -6678,7 +6629,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "derive_more 0.99.9", "directories", @@ -6740,7 +6691,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6754,7 +6705,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6775,7 +6726,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "erased-serde", "log 0.4.8", @@ -6792,7 +6743,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -6813,7 +6764,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -7245,7 +7196,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "derive_more 0.99.9", "log 0.4.8", @@ -7257,7 +7208,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "hash-db", "parity-scale-codec", @@ -7272,7 +7223,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -7284,7 +7235,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "parity-scale-codec", "serde", @@ -7296,7 +7247,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -7309,7 +7260,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "parity-scale-codec", "sp-api", @@ -7321,7 +7272,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7332,7 +7283,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "parity-scale-codec", "sp-api", @@ -7344,7 +7295,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "derive_more 0.99.9", "log 0.4.8", @@ -7361,7 +7312,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "serde", "serde_json", @@ -7370,7 +7321,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -7395,7 +7346,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "parity-scale-codec", "sp-api", @@ -7409,7 +7360,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "merlin", "parity-scale-codec", @@ -7428,7 +7379,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7437,7 +7388,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -7449,7 +7400,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "base58", "blake2-rfc", @@ -7492,7 +7443,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -7501,7 +7452,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -7511,7 +7462,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "environmental", "parity-scale-codec", @@ -7522,7 +7473,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "finality-grandpa", "log 0.4.8", @@ -7538,7 +7489,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7548,7 +7499,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "derive_more 0.99.9", "parity-scale-codec", @@ -7560,7 +7511,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "futures 0.3.5", "hash-db", @@ -7581,7 +7532,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "lazy_static", "sp-core", @@ -7592,7 +7543,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "parity-scale-codec", "serde", @@ -7604,7 +7555,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -7615,7 +7566,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "sp-api", "sp-core", @@ -7625,7 +7576,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "backtrace", "log 0.4.8", @@ -7634,7 +7585,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "serde", "sp-core", @@ -7643,7 +7594,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "either", "hash256-std-hasher", @@ -7665,7 +7616,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "parity-scale-codec", "primitive-types", @@ -7680,7 +7631,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "Inflector", "proc-macro-crate", @@ -7692,7 +7643,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "serde", "serde_json", @@ -7701,7 +7652,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "parity-scale-codec", "sp-api", @@ -7714,7 +7665,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7724,7 +7675,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "hash-db", "itertools 0.9.0", @@ -7745,12 +7696,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" [[package]] name = "sp-storage" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -7762,7 +7713,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7776,7 +7727,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "log 0.4.8", "rental", @@ -7786,7 +7737,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -7801,7 +7752,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "hash-db", "memory-db", @@ -7815,7 +7766,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "futures 0.3.5", "futures-core", @@ -7827,7 +7778,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -7839,7 +7790,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7904,15 +7855,6 @@ dependencies = [ "bytes 0.4.12", ] -[[package]] -name = "string-interner" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd710eadff449a1531351b0e43eb81ea404336fa2f56c777427ab0e32a4cf183" -dependencies = [ - "serde", -] - [[package]] name = "strsim" version = "0.8.0" @@ -7979,10 +7921,9 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "chrono", - "clear_on_drop", "console_error_panic_hook", "console_log", "futures 0.1.29", @@ -8006,7 +7947,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "platforms", ] @@ -8014,7 +7955,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -8037,7 +7978,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "async-std", "derive_more 0.99.9", @@ -8051,7 +7992,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "futures 0.1.29", "futures 0.3.5", @@ -8077,7 +8018,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "cfg-if", "frame-executive", @@ -8117,7 +8058,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" dependencies = [ "futures 0.3.5", "parity-scale-codec", @@ -8138,7 +8079,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.6" -source = "git+https://github.com/paritytech/substrate#065b0f321f223b4cb3b22cee0e71fa6930034e2a" +source = "git+https://github.com/paritytech/substrate#edb48cfdd90e2658017e696a33ae566c7e0940a4" [[package]] name = "substrate-wasm-builder-runner" @@ -8148,93 +8089,28 @@ checksum = "d2a965994514ab35d3893e9260245f2947fd1981cdd4fffd2c6e6d1a9ce02e6a" [[package]] name = "substrate-wasmtime" -version = "0.16.0-threadsafe.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bd62264edc1a5f3ef44d86fb0c11c9fb142894b9a2da034f34afae482080d7a" +version = "0.19.0" +source = "git+https://github.com/paritytech/wasmtime?branch=update-upstream#f744c4e564b40a4cfce6a7090f093ec1726c68e9" dependencies = [ "anyhow", "backtrace", "cfg-if", "lazy_static", "libc", + "log 0.4.8", "region", "rustc-demangle", - "substrate-wasmtime-jit", - "substrate-wasmtime-profiling", - "substrate-wasmtime-runtime", + "smallvec 1.4.1", "target-lexicon", - "wasmparser 0.52.2", + "wasmparser 0.59.0", "wasmtime-environ", + "wasmtime-jit", + "wasmtime-profiling", + "wasmtime-runtime", "wat", "winapi 0.3.9", ] -[[package]] -name = "substrate-wasmtime-jit" -version = "0.16.0-threadsafe.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ce43c159d4f3ef6b19641e1ae045847fd202d8e2cc74df7ccb2b6475e069d4a" -dependencies = [ - "anyhow", - "cfg-if", - "cranelift-codegen", - "cranelift-entity", - "cranelift-frontend", - "cranelift-native", - "cranelift-wasm", - "gimli 0.20.0", - "log 0.4.8", - "more-asserts", - "region", - "substrate-wasmtime-profiling", - "substrate-wasmtime-runtime", - "target-lexicon", - "thiserror", - "wasmparser 0.52.2", - "wasmtime-debug", - "wasmtime-environ", - "winapi 0.3.9", -] - -[[package]] -name = "substrate-wasmtime-profiling" -version = "0.16.0-threadsafe.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77f0ce539b5a09a54dc80a1cf0c7cd7e694df11029354fe50a2d5fe889bdb97" -dependencies = [ - "anyhow", - "cfg-if", - "gimli 0.20.0", - "lazy_static", - "libc", - "object 0.18.0", - "scroll", - "serde", - "substrate-wasmtime-runtime", - "target-lexicon", - "wasmtime-environ", -] - -[[package]] -name = "substrate-wasmtime-runtime" -version = "0.16.0-threadsafe.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46516af0a64a7d9b652c5aa7436b6ce13edfa54435a66ef177fc02d2283e2dc2" -dependencies = [ - "backtrace", - "cc", - "cfg-if", - "indexmap", - "lazy_static", - "libc", - "memoffset", - "more-asserts", - "region", - "thiserror", - "wasmtime-environ", - "winapi 0.3.9", -] - [[package]] name = "subtle" version = "1.0.0" @@ -9222,43 +9098,43 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.51.4" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeb1956b19469d1c5e63e459d29e7b5aa0f558d9f16fcef09736f8a265e6c10a" +checksum = "32fddd575d477c6e9702484139cf9f23dcd554b06d185ed0f56c857dd3a47aa6" [[package]] name = "wasmparser" -version = "0.52.2" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733954023c0b39602439e60a65126fd31b003196d3a1e8e4531b055165a79b31" +checksum = "a950e6a618f62147fd514ff445b2a0b53120d382751960797f85f058c7eda9b9" [[package]] name = "wasmtime-debug" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d39ba645aee700b29ff0093028b4123556dd142a74973f04ed6225eedb40e77d" +version = "0.19.0" +source = "git+https://github.com/paritytech/wasmtime?branch=update-upstream#f744c4e564b40a4cfce6a7090f093ec1726c68e9" dependencies = [ "anyhow", - "faerie", - "gimli 0.20.0", + "gimli 0.21.0", "more-asserts", + "object 0.20.0", "target-lexicon", "thiserror", - "wasmparser 0.51.4", + "wasmparser 0.59.0", "wasmtime-environ", ] [[package]] name = "wasmtime-environ" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed54fd9d64dfeeee7c285fd126174a6b5e6d4efc7e5a1566fdb635e60ff6a74e" +version = "0.19.0" +source = "git+https://github.com/paritytech/wasmtime?branch=update-upstream#f744c4e564b40a4cfce6a7090f093ec1726c68e9" dependencies = [ "anyhow", "base64 0.12.3", "bincode", + "cfg-if", "cranelift-codegen", "cranelift-entity", + "cranelift-frontend", "cranelift-wasm", "directories", "errno", @@ -9272,11 +9148,90 @@ dependencies = [ "sha2 0.8.2", "thiserror", "toml", - "wasmparser 0.51.4", + "wasmparser 0.59.0", "winapi 0.3.9", "zstd", ] +[[package]] +name = "wasmtime-jit" +version = "0.19.0" +source = "git+https://github.com/paritytech/wasmtime?branch=update-upstream#f744c4e564b40a4cfce6a7090f093ec1726c68e9" +dependencies = [ + "anyhow", + "cfg-if", + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", + "cranelift-native", + "cranelift-wasm", + "gimli 0.21.0", + "log 0.4.8", + "more-asserts", + "object 0.20.0", + "region", + "target-lexicon", + "thiserror", + "wasmparser 0.59.0", + "wasmtime-debug", + "wasmtime-environ", + "wasmtime-obj", + "wasmtime-profiling", + "wasmtime-runtime", + "winapi 0.3.9", +] + +[[package]] +name = "wasmtime-obj" +version = "0.19.0" +source = "git+https://github.com/paritytech/wasmtime?branch=update-upstream#f744c4e564b40a4cfce6a7090f093ec1726c68e9" +dependencies = [ + "anyhow", + "more-asserts", + "object 0.20.0", + "target-lexicon", + "wasmtime-debug", + "wasmtime-environ", +] + +[[package]] +name = "wasmtime-profiling" +version = "0.19.0" +source = "git+https://github.com/paritytech/wasmtime?branch=update-upstream#f744c4e564b40a4cfce6a7090f093ec1726c68e9" +dependencies = [ + "anyhow", + "cfg-if", + "gimli 0.21.0", + "lazy_static", + "libc", + "object 0.19.0", + "scroll", + "serde", + "target-lexicon", + "wasmtime-environ", + "wasmtime-runtime", +] + +[[package]] +name = "wasmtime-runtime" +version = "0.19.0" +source = "git+https://github.com/paritytech/wasmtime?branch=update-upstream#f744c4e564b40a4cfce6a7090f093ec1726c68e9" +dependencies = [ + "backtrace", + "cc", + "cfg-if", + "indexmap", + "lazy_static", + "libc", + "log 0.4.8", + "memoffset", + "more-asserts", + "region", + "thiserror", + "wasmtime-environ", + "winapi 0.3.9", +] + [[package]] name = "wast" version = "21.0.0" From 1d46e470a7f736836b425e229f4b17940a9ef188 Mon Sep 17 00:00:00 2001 From: Wei Tang Date: Thu, 23 Jul 2020 14:37:57 +0200 Subject: [PATCH 4/4] Bump runtime impl_version --- runtime/kusama/src/lib.rs | 2 +- runtime/polkadot/src/lib.rs | 2 +- runtime/test-runtime/src/lib.rs | 2 +- runtime/westend/src/lib.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 7354feb6ddd6..b1e14ed5aaca 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -88,7 +88,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_name: create_runtime_str!("parity-kusama"), authoring_version: 2, spec_version: 2019, - impl_version: 0, + impl_version: 1, #[cfg(not(feature = "disable-runtime-api"))] apis: RUNTIME_API_VERSIONS, #[cfg(feature = "disable-runtime-api")] diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index e7afcfe16b71..e479742423f9 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -87,7 +87,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_name: create_runtime_str!("parity-polkadot"), authoring_version: 0, spec_version: 19, - impl_version: 0, + impl_version: 1, #[cfg(not(feature = "disable-runtime-api"))] apis: RUNTIME_API_VERSIONS, #[cfg(feature = "disable-runtime-api")] diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index 032efaacfbec..82dc043e58a7 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -83,7 +83,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_name: create_runtime_str!("parity-polkadot-test-runtime"), authoring_version: 2, spec_version: 1053, - impl_version: 0, + impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 1, }; diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 6d7fdc79f00b..adba5cbbec2f 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -84,7 +84,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_name: create_runtime_str!("parity-westend"), authoring_version: 2, spec_version: 39, - impl_version: 0, + impl_version: 1, #[cfg(not(feature = "disable-runtime-api"))] apis: RUNTIME_API_VERSIONS, #[cfg(feature = "disable-runtime-api")]