From 6a7e1c37cc1d1e5d5d2e00de59a00c094a57c6ee Mon Sep 17 00:00:00 2001 From: clearloop Date: Mon, 31 May 2021 14:20:48 +0800 Subject: [PATCH 01/32] feat(benchmarks): add feature runtime-benchmarks to all pallets --- Cargo.lock | 477 ++++++++++--------- pallets/asset-depository/Cargo.toml | 14 + pallets/asset-depository/src/benchmarking.rs | 5 + pallets/asset-index/Cargo.toml | 15 + pallets/committee/Cargo.toml | 6 +- pallets/local-treasury/Cargo.toml | 13 + pallets/price-feed/Cargo.toml | 13 + pallets/remote-asset-manager/Cargo.toml | 12 +- pallets/saft-registry/Cargo.toml | 12 + pallets/xcm-asset-support/Cargo.toml | 8 + 10 files changed, 338 insertions(+), 237 deletions(-) create mode 100644 pallets/asset-depository/src/benchmarking.rs diff --git a/Cargo.lock b/Cargo.lock index 1b34ab0832..cd31e182f3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1993,39 +1993,39 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "3.1.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "linregress", "log", "parity-scale-codec", "paste", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-runtime-interface 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", ] [[package]] name = "frame-benchmarking" version = "3.1.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git)", "linregress", "log", "parity-scale-codec", "paste", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-runtime-interface 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git)", ] [[package]] @@ -2079,17 +2079,6 @@ dependencies = [ "sp-tracing 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", ] -[[package]] -name = "frame-metadata" -version = "13.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "parity-scale-codec", - "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", -] - [[package]] name = "frame-metadata" version = "13.0.0" @@ -2102,29 +2091,14 @@ dependencies = [ ] [[package]] -name = "frame-support" -version = "3.0.0" +name = "frame-metadata" +version = "13.0.0" source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ - "bitflags", - "frame-metadata 13.0.0 (git+https://github.com/paritytech/substrate.git)", - "frame-support-procedural 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "impl-trait-for-tuples", - "log", - "once_cell", "parity-scale-codec", - "paste", "serde", - "smallvec 1.6.1", - "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git)", "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-staking 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git)", "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-tracing 3.0.0 (git+https://github.com/paritytech/substrate.git)", ] [[package]] @@ -2154,15 +2128,29 @@ dependencies = [ ] [[package]] -name = "frame-support-procedural" +name = "frame-support" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ - "Inflector", - "frame-support-procedural-tools 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "proc-macro2 1.0.26", - "quote 1.0.9", - "syn 1.0.72", + "bitflags", + "frame-metadata 13.0.0 (git+https://github.com/paritytech/substrate.git)", + "frame-support-procedural 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "impl-trait-for-tuples", + "log", + "once_cell", + "parity-scale-codec", + "paste", + "serde", + "smallvec 1.6.1", + "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-staking 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-tracing 3.0.0 (git+https://github.com/paritytech/substrate.git)", ] [[package]] @@ -2178,12 +2166,12 @@ dependencies = [ ] [[package]] -name = "frame-support-procedural-tools" +name = "frame-support-procedural" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ - "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "proc-macro-crate 1.0.0", + "Inflector", + "frame-support-procedural-tools 3.0.0 (git+https://github.com/paritytech/substrate.git)", "proc-macro2 1.0.26", "quote 1.0.9", "syn 1.0.72", @@ -2202,10 +2190,12 @@ dependencies = [ ] [[package]] -name = "frame-support-procedural-tools-derive" +name = "frame-support-procedural-tools" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ + "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "proc-macro-crate 1.0.0", "proc-macro2 1.0.26", "quote 1.0.9", "syn 1.0.72", @@ -2222,20 +2212,13 @@ dependencies = [ ] [[package]] -name = "frame-system" +name = "frame-support-procedural-tools-derive" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", ] [[package]] @@ -2255,6 +2238,23 @@ dependencies = [ "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", ] +[[package]] +name = "frame-system" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +dependencies = [ + "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "serde", + "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git)", +] + [[package]] name = "frame-system-benchmarking" version = "3.0.0" @@ -4626,6 +4626,7 @@ dependencies = [ name = "pallet-asset-depository" version = "0.0.1" dependencies = [ + "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "parity-scale-codec", @@ -4639,6 +4640,7 @@ dependencies = [ name = "pallet-asset-index" version = "0.0.1" dependencies = [ + "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "pallet-asset-depository", @@ -4924,6 +4926,7 @@ dependencies = [ name = "pallet-local-treasury" version = "0.0.1" dependencies = [ + "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "pallet-balances", @@ -5070,6 +5073,7 @@ dependencies = [ name = "pallet-price-feed" version = "0.0.1" dependencies = [ + "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "pallet-balances", @@ -5127,6 +5131,7 @@ dependencies = [ name = "pallet-remote-asset-manager" version = "0.0.1" dependencies = [ + "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "pallet-balances", @@ -5144,6 +5149,7 @@ dependencies = [ name = "pallet-saft-registry" version = "0.0.1" dependencies = [ + "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "pallet-asset-index", @@ -5406,6 +5412,7 @@ dependencies = [ name = "pallet-xcm-asset-support" version = "0.0.1" dependencies = [ + "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "pallet-balances", @@ -9129,41 +9136,41 @@ dependencies = [ [[package]] name = "sp-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "hash-db", "log", "parity-scale-codec", - "sp-api-proc-macro 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-api-proc-macro 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "thiserror", ] [[package]] name = "sp-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ "hash-db", "log", "parity-scale-codec", - "sp-api-proc-macro 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api-proc-macro 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git)", "thiserror", ] [[package]] name = "sp-api-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "blake2-rfc", "proc-macro-crate 1.0.0", @@ -9175,7 +9182,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ "blake2-rfc", "proc-macro-crate 1.0.0", @@ -9187,52 +9194,52 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "parity-scale-codec", "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", ] [[package]] name = "sp-application-crypto" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ "parity-scale-codec", "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", ] [[package]] name = "sp-arithmetic" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "serde", - "sp-debug-derive 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-debug-derive 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "static_assertions", ] [[package]] name = "sp-arithmetic" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "serde", - "sp-debug-derive 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-debug-derive 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", "static_assertions", ] @@ -9371,7 +9378,7 @@ dependencies = [ [[package]] name = "sp-core" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "base58", "blake2-rfc", @@ -9398,11 +9405,11 @@ dependencies = [ "secrecy", "serde", "sha2 0.9.5", - "sp-debug-derive 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git)", - "sp-runtime-interface 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-debug-derive 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "substrate-bip39", "thiserror", "tiny-bip39", @@ -9415,7 +9422,7 @@ dependencies = [ [[package]] name = "sp-core" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ "base58", "blake2-rfc", @@ -9442,11 +9449,11 @@ dependencies = [ "secrecy", "serde", "sha2 0.9.5", - "sp-debug-derive 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-debug-derive 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git)", + "sp-runtime-interface 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git)", "substrate-bip39", "thiserror", "tiny-bip39", @@ -9468,7 +9475,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", @@ -9478,7 +9485,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", @@ -9488,23 +9495,23 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", ] [[package]] name = "sp-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git)", ] [[package]] @@ -9524,6 +9531,18 @@ dependencies = [ "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", ] +[[package]] +name = "sp-inherents" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +dependencies = [ + "parity-scale-codec", + "parking_lot 0.11.1", + "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "thiserror", +] + [[package]] name = "sp-inherents" version = "3.0.0" @@ -9539,15 +9558,27 @@ dependencies = [ ] [[package]] -name = "sp-inherents" +name = "sp-io" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ + "futures 0.3.15", + "hash-db", + "libsecp256k1", + "log", "parity-scale-codec", "parking_lot 0.11.1", "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "thiserror", + "sp-tracing 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-wasm-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "tracing", + "tracing-core", ] [[package]] @@ -9575,30 +9606,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "sp-io" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" -dependencies = [ - "futures 0.3.15", - "hash-db", - "libsecp256k1", - "log", - "parity-scale-codec", - "parking_lot 0.11.1", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-tracing 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-wasm-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "tracing", - "tracing-core", -] - [[package]] name = "sp-keyring" version = "3.0.0" @@ -9613,7 +9620,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "async-trait", "derive_more 0.99.13", @@ -9622,14 +9629,15 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.11.1", "schnorrkel", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git)", + "serde", + "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", ] [[package]] name = "sp-keystore" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ "async-trait", "derive_more 0.99.13", @@ -9638,15 +9646,14 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.11.1", "schnorrkel", - "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git)", ] [[package]] name = "sp-maybe-compressed-blob" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "ruzstd", "zstd", @@ -9655,7 +9662,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ "ruzstd", "zstd", @@ -9698,7 +9705,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "backtrace", ] @@ -9706,7 +9713,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ "backtrace", ] @@ -9723,7 +9730,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "either", "hash256-std-hasher", @@ -9734,17 +9741,17 @@ dependencies = [ "paste", "rand 0.7.3", "serde", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", ] [[package]] name = "sp-runtime" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ "either", "hash256-std-hasher", @@ -9755,51 +9762,51 @@ dependencies = [ "paste", "rand 0.7.3", "serde", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", ] [[package]] name = "sp-runtime-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git)", - "sp-runtime-interface-proc-macro 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-tracing 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-wasm-interface 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime-interface-proc-macro 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-tracing 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-wasm-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "static_assertions", ] [[package]] name = "sp-runtime-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime-interface-proc-macro 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-tracing 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-wasm-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git)", + "sp-runtime-interface-proc-macro 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-tracing 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-wasm-interface 3.0.0 (git+https://github.com/paritytech/substrate.git)", "static_assertions", ] [[package]] name = "sp-runtime-interface-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", @@ -9811,7 +9818,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", @@ -9845,27 +9852,27 @@ dependencies = [ [[package]] name = "sp-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "parity-scale-codec", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", ] [[package]] name = "sp-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ "parity-scale-codec", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", ] [[package]] name = "sp-state-machine" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "hash-db", "log", @@ -9874,13 +9881,12 @@ dependencies = [ "parking_lot 0.11.1", "rand 0.7.3", "smallvec 1.6.1", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git)", - "sp-panic-handler 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-panic-handler 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "thiserror", - "tracing", "trie-db", "trie-root", ] @@ -9888,7 +9894,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ "hash-db", "log", @@ -9897,12 +9903,13 @@ dependencies = [ "parking_lot 0.11.1", "rand 0.7.3", "smallvec 1.6.1", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-panic-handler 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git)", + "sp-panic-handler 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git)", "thiserror", + "tracing", "trie-db", "trie-root", ] @@ -9910,37 +9917,37 @@ dependencies = [ [[package]] name = "sp-std" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" [[package]] name = "sp-std" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" [[package]] name = "sp-storage" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-debug-derive 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", ] [[package]] name = "sp-storage" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-debug-derive 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", ] [[package]] @@ -9972,16 +9979,11 @@ dependencies = [ [[package]] name = "sp-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "erased-serde", "log", "parity-scale-codec", - "parking_lot 0.10.2", - "serde", - "serde_json", - "slog", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "tracing", "tracing-core", "tracing-subscriber", @@ -9990,11 +9992,16 @@ dependencies = [ [[package]] name = "sp-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ + "erased-serde", "log", "parity-scale-codec", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "parking_lot 0.10.2", + "serde", + "serde_json", + "slog", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", "tracing", "tracing-core", "tracing-subscriber", @@ -10019,13 +10026,13 @@ dependencies = [ [[package]] name = "sp-trie" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "hash-db", "memory-db", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "trie-db", "trie-root", ] @@ -10033,13 +10040,13 @@ dependencies = [ [[package]] name = "sp-trie" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ "hash-db", "memory-db", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", "trie-db", "trie-root", ] @@ -10059,26 +10066,26 @@ dependencies = [ [[package]] name = "sp-version" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "impl-serde", "parity-scale-codec", "serde", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-version-proc-macro", + "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", ] [[package]] name = "sp-version" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ "impl-serde", "parity-scale-codec", "serde", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-version-proc-macro", ] [[package]] @@ -10096,22 +10103,22 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" +source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "wasmi", ] [[package]] name = "sp-wasm-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", "wasmi", ] diff --git a/pallets/asset-depository/Cargo.toml b/pallets/asset-depository/Cargo.toml index 914c5bc4a1..9992b47e74 100644 --- a/pallets/asset-depository/Cargo.toml +++ b/pallets/asset-depository/Cargo.toml @@ -15,6 +15,13 @@ std = [ 'frame-support/std', 'frame-system/std', ] +runtime-benchmarks = [ + 'frame-benchmarking', + 'sp-runtime/runtime-benchmarks', + 'frame-support/runtime-benchmarks', + 'frame-system/runtime-benchmarks', +] + [dependencies.codec] default-features = false features = ['derive'] @@ -33,6 +40,13 @@ git = 'https://github.com/paritytech/substrate.git' branch = 'rococo-v1' version = '3.0.0' +[dependencies.frame-benchmarking] +default-features = false +git = 'https://github.com/paritytech/substrate.git' +branch = 'rococo-v1' +version = '3.0.0' +optional = true + [dev-dependencies] serde = { version = "1.0.101" } diff --git a/pallets/asset-depository/src/benchmarking.rs b/pallets/asset-depository/src/benchmarking.rs new file mode 100644 index 0000000000..824af4875d --- /dev/null +++ b/pallets/asset-depository/src/benchmarking.rs @@ -0,0 +1,5 @@ +//! Benchmarks +//! +//! TODO: +//! +//! This pallet contains no calls currently. diff --git a/pallets/asset-index/Cargo.toml b/pallets/asset-index/Cargo.toml index c705f74939..ba10dc2eec 100644 --- a/pallets/asset-index/Cargo.toml +++ b/pallets/asset-index/Cargo.toml @@ -21,6 +21,15 @@ std = [ 'xcm/std', 'xcm-executor/std', ] +runtime-benchmarks = [ + 'frame-benchmarking', + 'sp-runtime/runtime-benchmarks', + 'frame-support/runtime-benchmarks', + 'pallet-remote-asset-manager/runtime-benchmarks', + 'pallet-asset-depository/runtime-benchmarks', + 'pallet-price-feed/runtime-benchmarks', +] + [dependencies.codec] default-features = false features = ['derive'] @@ -45,6 +54,12 @@ git = 'https://github.com/paritytech/substrate.git' branch = 'rococo-v1' version = '3.0.0' +[dependencies.frame-benchmarking] +default-features = false +git = 'https://github.com/paritytech/substrate' +branch = 'rococo-v1' +optional = true + [dependencies.xcm] git = "https://github.com/paritytech/polkadot" branch = 'rococo-v1' diff --git a/pallets/committee/Cargo.toml b/pallets/committee/Cargo.toml index 6b22e03272..c5f7263be5 100644 --- a/pallets/committee/Cargo.toml +++ b/pallets/committee/Cargo.toml @@ -18,7 +18,11 @@ std = [ 'sp-runtime/std', ] # this feature is only for compilation now -runtime-benchmarks = [] +runtime-benchmarks = [ + 'frame-support/runtime-benchmarks', + 'frame-system/runtime-benchmarks', + 'sp-runtime/runtime-benchmarks', +] [dependencies.codec] default-features = false diff --git a/pallets/local-treasury/Cargo.toml b/pallets/local-treasury/Cargo.toml index fd89a29631..4afc26ad66 100644 --- a/pallets/local-treasury/Cargo.toml +++ b/pallets/local-treasury/Cargo.toml @@ -15,6 +15,12 @@ std = [ 'frame-support/std', 'frame-system/std', ] +runtime-benchmarks = [ + 'codec/std', + 'frame-benchmarking', + 'frame-support/runtime-benchmarks', +] + [dependencies.codec] default-features = false features = ['derive'] @@ -33,6 +39,13 @@ git = 'https://github.com/paritytech/substrate.git' branch = 'rococo-v1' version = '3.0.0' +[dependencies.frame-benchmarking] +default-features = false +git = 'https://github.com/paritytech/substrate.git' +branch = 'rococo-v1' +version = '3.0.0' +optional = true + [dev-dependencies] serde = { version = "1.0.101" } diff --git a/pallets/price-feed/Cargo.toml b/pallets/price-feed/Cargo.toml index ae3d74f8cc..daab176241 100644 --- a/pallets/price-feed/Cargo.toml +++ b/pallets/price-feed/Cargo.toml @@ -17,6 +17,12 @@ std = [ 'frame-system/std', 'pallet-chainlink-feed/std', ] +runtime-benchmarks = [ + 'frame-benchmarking', + 'frame-support/runtime-benchmarks', + # 'pallet-chainlink-feed/runtime-benchmarks', +] + [dependencies.codec] default-features = false features = ['derive'] @@ -47,6 +53,13 @@ branch = "substrate-v3" [dependencies] serde = { version = "1.0.101", optional = true } +[dependencies.frame-benchmarking] +default-features = false +git = 'https://github.com/paritytech/substrate.git' +branch = 'rococo-v1' +version = '3.0.0' +optional = true + [dev-dependencies.pallet-balances] default-features = false git = 'https://github.com/paritytech/substrate.git' diff --git a/pallets/remote-asset-manager/Cargo.toml b/pallets/remote-asset-manager/Cargo.toml index 3b65ac80ab..a5ad708131 100644 --- a/pallets/remote-asset-manager/Cargo.toml +++ b/pallets/remote-asset-manager/Cargo.toml @@ -18,7 +18,10 @@ std = [ 'xcm-executor/std', ] # this feature is only for compilation now -runtime-benchmarks = [] +runtime-benchmarks = [ + 'frame-benchmarking', + 'frame-support/runtime-benchmarks' +] [dependencies.codec] default-features = false @@ -38,6 +41,13 @@ git = 'https://github.com/paritytech/substrate.git' branch = 'rococo-v1' version = '3.0.0' +[dependencies.frame-benchmarking] +default-features = false +git = 'https://github.com/paritytech/substrate.git' +branch = 'rococo-v1' +version = '3.0.0' +optional = true + [dependencies.xcm] default-features = false git = 'https://github.com/paritytech/polkadot' diff --git a/pallets/saft-registry/Cargo.toml b/pallets/saft-registry/Cargo.toml index b870cd426e..0293c4cb4d 100644 --- a/pallets/saft-registry/Cargo.toml +++ b/pallets/saft-registry/Cargo.toml @@ -16,6 +16,11 @@ std = [ 'frame-system/std', 'pallet-asset-index/std' ] +runtime-benchmarks = [ + 'frame-benchmarking', + 'frame-support/runtime-benchmarks', + 'pallet-asset-index/runtime-benchmarks', +] [dependencies.pallet-asset-index] default-features = false @@ -39,6 +44,13 @@ git = 'https://github.com/paritytech/substrate.git' branch = 'rococo-v1' version = '3.0.0' +[dependencies.frame-benchmarking] +default-features = false +git = 'https://github.com/paritytech/substrate.git' +branch = 'rococo-v1' +version = '3.0.0' +optional = true + [dev-dependencies] serde = { version = "1.0.101" } diff --git a/pallets/xcm-asset-support/Cargo.toml b/pallets/xcm-asset-support/Cargo.toml index d9ee6b2c1a..d81a12f04f 100644 --- a/pallets/xcm-asset-support/Cargo.toml +++ b/pallets/xcm-asset-support/Cargo.toml @@ -19,6 +19,7 @@ std = [ ] # this feature is only for compilation now runtime-benchmarks = [ + 'frame-benchmarking', 'xcm-builder/runtime-benchmarks', ] @@ -40,6 +41,13 @@ git = 'https://github.com/paritytech/substrate.git' branch = 'rococo-v1' version = '3.0.0' +[dependencies.frame-benchmarking] +default-features = false +git = 'https://github.com/paritytech/substrate.git' +branch = 'rococo-v1' +version = '3.0.0' +optional = true + [dependencies.xcm] default-features = false git = 'https://github.com/paritytech/polkadot' From 02867e36aed4743541a98dc58b31d047f162abd5 Mon Sep 17 00:00:00 2001 From: clearloop Date: Mon, 31 May 2021 17:53:30 +0800 Subject: [PATCH 02/32] feat(benchmark): add benchmark command to cli --- node/Cargo.toml | 2 ++ node/src/cli.rs | 4 +++ node/src/command.rs | 11 ++++++++ pallets/asset-index/src/benchmarking.rs | 34 +++++++++++++++++++++++++ pallets/asset-index/src/lib.rs | 4 ++- 5 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 pallets/asset-index/src/benchmarking.rs diff --git a/node/Cargo.toml b/node/Cargo.toml index da873d51d9..1fa9c38b03 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -17,6 +17,7 @@ version = '3.0.0' git = 'https://github.com/paritytech/substrate.git' branch = 'rococo-v1' version = '3.0.0' +optional = true [dependencies.parachain-runtime] path = '../runtime' @@ -217,6 +218,7 @@ targets = ['x86_64-unknown-linux-gnu'] [features] default = [] runtime-benchmarks = [ + 'frame-benchmarking-cli', 'parachain-runtime/runtime-benchmarks', 'polkadot-service/runtime-benchmarks' ] diff --git a/node/src/cli.rs b/node/src/cli.rs index c3654a8b14..32bdbbf97f 100644 --- a/node/src/cli.rs +++ b/node/src/cli.rs @@ -36,6 +36,10 @@ pub enum Subcommand { /// Revert the chain to a previous state. Revert(sc_cli::RevertCmd), + + /// The custom benchmark subcommmand benchmarking runtime pallets. + #[structopt(name = "benchmark", about = "Benchmark runtime pallets.")] + Benchmark(frame_benchmarking_cli::BenchmarkCmd), } /// Command for exporting the genesis state of the parachain diff --git a/node/src/command.rs b/node/src/command.rs index 0a16eb8017..5e0e81ae41 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -258,6 +258,17 @@ pub fn run() -> Result<()> { Ok(()) } + Some(Subcommand::Benchmark(params)) => { + if cfg!(feature = "runtime-benchmarks") { + let runner = cli.create_runner(params)?; + + runner.sync_run(|config| params.run::(config)) + } else { + Err("Benchmarking wasn't enabled when building the node. \ + You can enable it with `--features runtime-benchmarks`." + .into()) + } + } None => { let runner = cli.create_runner(&*cli.run)?; diff --git a/pallets/asset-index/src/benchmarking.rs b/pallets/asset-index/src/benchmarking.rs new file mode 100644 index 0000000000..7bb9666cd0 --- /dev/null +++ b/pallets/asset-index/src/benchmarking.rs @@ -0,0 +1,34 @@ +//! benchmarks +//! +//! add_asset +//! deposit +//! withdraw +use super::*; +use crate::types::{AssetAvailability, IndexAssetData}; +use frame_benchmarking::{benchmarks, whitelisted_caller}; +use frame_system::RawOrigin; +use xcm::v0::MultiLocation; + +benchmarks! { + add_asset { + let caller: T::AccountId = whitelisted_caller(); + let million = 1_000_000u32.into(); + let asset_id = 42.into(); + }: _( + RawOrigin::Signed(caller.clone()), + asset_id, + million, + AssetAvailability::Liquid(MultiLocation::Null), + million + ) verify { + assert_eq!( + >::get(asset_id), + Some(IndexAssetData::new( + million, + AssetAvailability::Liquid(MultiLocation::Null) + )) + ); + assert_eq!(>::index_token_balance(&caller), million); + assert_eq!(>::index_token_issuance(), million); + } +} diff --git a/pallets/asset-index/src/lib.rs b/pallets/asset-index/src/lib.rs index b1440c667e..c513b65367 100644 --- a/pallets/asset-index/src/lib.rs +++ b/pallets/asset-index/src/lib.rs @@ -15,6 +15,8 @@ mod mock; #[cfg(test)] mod tests; +#[cfg(feature = "runtime-benchmarks")] +mod benchmarking; pub mod traits; mod types; @@ -87,7 +89,7 @@ pub mod pallet { Self::Balance, >; /// Type used to identify assets - type AssetId: Parameter + Member; + type AssetId: Parameter + Member + From + Copy; /// Handles asset depositing and withdrawing from sovereign user accounts type MultiAssetDepository: MultiAssetDepository< Self::AssetId, From 1466317b8323676207697593c260f5562224ab84 Mon Sep 17 00:00:00 2001 From: clearloop Date: Mon, 31 May 2021 18:32:42 +0800 Subject: [PATCH 03/32] feat(spec): load spec without path --- node/src/command.rs | 9 +++++---- node/src/service.rs | 1 + pallets/asset-depository/Cargo.toml | 1 - pallets/asset-index/Cargo.toml | 1 - runtime/Cargo.toml | 4 ++++ 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/node/src/command.rs b/node/src/command.rs index 5e0e81ae41..fbdbcc3a70 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -30,11 +30,12 @@ fn load_spec( para_id: ParaId, ) -> std::result::Result, String> { Ok(match id { - "pint-dev" => Box::new(chain_spec::pint_development_config(para_id)), "pint-local" => Box::new(chain_spec::pint_local_config(para_id)), - path => Box::new(chain_spec::ChainSpec::from_json_file( - std::path::PathBuf::from(path), - )?), + "pint-dev" => Box::new(chain_spec::pint_development_config(para_id)), + path => Box::new( + chain_spec::ChainSpec::from_json_file(std::path::PathBuf::from(path)) + .unwrap_or(chain_spec::pint_development_config(para_id)), + ), }) } diff --git a/node/src/service.rs b/node/src/service.rs index 6d3509e35a..02d665e965 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -24,6 +24,7 @@ native_executor_instance!( pub Executor, parachain_runtime::api::dispatch, parachain_runtime::native_version, + frame_benchmarking::benchmarking::HostFunctions, ); /// Starts a `ServiceBuilder` for a full service. diff --git a/pallets/asset-depository/Cargo.toml b/pallets/asset-depository/Cargo.toml index 9992b47e74..33b2cd823d 100644 --- a/pallets/asset-depository/Cargo.toml +++ b/pallets/asset-depository/Cargo.toml @@ -17,7 +17,6 @@ std = [ ] runtime-benchmarks = [ 'frame-benchmarking', - 'sp-runtime/runtime-benchmarks', 'frame-support/runtime-benchmarks', 'frame-system/runtime-benchmarks', ] diff --git a/pallets/asset-index/Cargo.toml b/pallets/asset-index/Cargo.toml index ba10dc2eec..8888ee6dc2 100644 --- a/pallets/asset-index/Cargo.toml +++ b/pallets/asset-index/Cargo.toml @@ -23,7 +23,6 @@ std = [ ] runtime-benchmarks = [ 'frame-benchmarking', - 'sp-runtime/runtime-benchmarks', 'frame-support/runtime-benchmarks', 'pallet-remote-asset-manager/runtime-benchmarks', 'pallet-asset-depository/runtime-benchmarks', diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 58c6ffa2ac..92755023da 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -278,6 +278,10 @@ runtime-benchmarks = [ 'frame-system-benchmarking', 'hex-literal', 'frame-system/runtime-benchmarks', + 'pallet-asset-depository/runtime-benchmarks', + 'pallet-asset-index/runtime-benchmarks', + 'pallet-remote-asset-manager/runtime-benchmarks', + 'pallet-price-feed/runtime-benchmarks', 'pallet-balances/runtime-benchmarks', 'pallet-timestamp/runtime-benchmarks', 'pallet-committee/runtime-benchmarks', From 0e3afe83325790eeed3489e3b6fc14a28d2b325d Mon Sep 17 00:00:00 2001 From: clearloop Date: Tue, 1 Jun 2021 13:10:02 +0800 Subject: [PATCH 04/32] feat(cli): enable benchmark command only with feature runtime-benchmarks --- node/src/cli.rs | 1 + pallets/asset-index/src/benchmarking.rs | 46 +++++++++++++++++++++++-- runtime/Cargo.toml | 1 - runtime/src/lib.rs | 7 ++-- 4 files changed, 49 insertions(+), 6 deletions(-) diff --git a/node/src/cli.rs b/node/src/cli.rs index 32bdbbf97f..7740547298 100644 --- a/node/src/cli.rs +++ b/node/src/cli.rs @@ -37,6 +37,7 @@ pub enum Subcommand { /// Revert the chain to a previous state. Revert(sc_cli::RevertCmd), + #[cfg(feature = "runtime-benchmarks")] /// The custom benchmark subcommmand benchmarking runtime pallets. #[structopt(name = "benchmark", about = "Benchmark runtime pallets.")] Benchmark(frame_benchmarking_cli::BenchmarkCmd), diff --git a/pallets/asset-index/src/benchmarking.rs b/pallets/asset-index/src/benchmarking.rs index 7bb9666cd0..dce12047b8 100644 --- a/pallets/asset-index/src/benchmarking.rs +++ b/pallets/asset-index/src/benchmarking.rs @@ -6,14 +6,16 @@ use super::*; use crate::types::{AssetAvailability, IndexAssetData}; use frame_benchmarking::{benchmarks, whitelisted_caller}; +use frame_support::{assert_ok, traits::Currency}; use frame_system::RawOrigin; use xcm::v0::MultiLocation; benchmarks! { add_asset { + let asset_id = 42.into(); let caller: T::AccountId = whitelisted_caller(); let million = 1_000_000u32.into(); - let asset_id = 42.into(); + T::IndexToken::deposit_creating(&caller, million); }: _( RawOrigin::Signed(caller.clone()), asset_id, @@ -28,7 +30,45 @@ benchmarks! { AssetAvailability::Liquid(MultiLocation::Null) )) ); - assert_eq!(>::index_token_balance(&caller), million); - assert_eq!(>::index_token_issuance(), million); + // TODO: + // + // We are using `deposit_into_existing` currently now which means + // we could not add asset to an account which has no balance + // + // assert_eq!(>::index_token_balance(&caller), total); + + // TODO: + // + // The value of `total_token_issuance` is not correct + // + // assert_eq!(>::index_token_issuance(), total); + } + + deposit { + let asset_id = 42.into(); + let caller: T::AccountId = whitelisted_caller(); + let million = 1_000_000u32.into(); + T::IndexToken::deposit_creating(&caller, million); + + // add_asset + assert_ok!(>::add_asset( + RawOrigin::Signed(caller.clone()).into(), + asset_id, + million, + AssetAvailability::Liquid(MultiLocation::Null), + million + )); + }: _( + RawOrigin::Signed(caller.clone()), + asset_id, + million + ) verify { + assert_eq!( + >::get(asset_id), + Some(IndexAssetData::new( + million + million, + AssetAvailability::Liquid(MultiLocation::Null) + )) + ); } } diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 92755023da..4f0674d7d2 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -280,7 +280,6 @@ runtime-benchmarks = [ 'frame-system/runtime-benchmarks', 'pallet-asset-depository/runtime-benchmarks', 'pallet-asset-index/runtime-benchmarks', - 'pallet-remote-asset-manager/runtime-benchmarks', 'pallet-price-feed/runtime-benchmarks', 'pallet-balances/runtime-benchmarks', 'pallet-timestamp/runtime-benchmarks', diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 939f85348e..8d8cf2e57e 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -536,8 +536,10 @@ parameter_types! { } impl pallet_asset_index::Config for Runtime { - // Using root as the admin origin for now - type AdminOrigin = frame_system::EnsureRoot; + // TODO: + // + // Using signed as the admin origin for testing now + type AdminOrigin = frame_system::EnsureSigned; type Event = Event; type AssetId = AssetId; type IndexToken = Balances; @@ -819,6 +821,7 @@ impl_runtime_apis! { add_benchmark!(params, batches, frame_system, SystemBench::); add_benchmark!(params, batches, pallet_balances, Balances); add_benchmark!(params, batches, pallet_timestamp, Timestamp); + add_benchmark!(params, batches, pallet_asset_index, AssetIndex); if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) } Ok(batches) From d20a0a3805e5a8e7b1afd27f86e5d1de9e38f88d Mon Sep 17 00:00:00 2001 From: clearloop Date: Tue, 1 Jun 2021 13:22:08 +0800 Subject: [PATCH 05/32] chore(benchmakrs): configure runtime-benchmarks features to command benchmark --- node/src/command.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/node/src/command.rs b/node/src/command.rs index fbdbcc3a70..64949ccf93 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -259,6 +259,7 @@ pub fn run() -> Result<()> { Ok(()) } + #[cfg(feature = "runtime-benchmarks")] Some(Subcommand::Benchmark(params)) => { if cfg!(feature = "runtime-benchmarks") { let runner = cli.create_runner(params)?; From adfda2aeb2947ea64130f2497df8864ee0cf6a8f Mon Sep 17 00:00:00 2001 From: clearloop Date: Tue, 1 Jun 2021 15:34:11 +0800 Subject: [PATCH 06/32] chore(benchmarks): leave comments to withdraw in asset-index --- pallets/asset-depository/src/benchmarking.rs | 2 ++ pallets/asset-index/src/benchmarking.rs | 22 +++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pallets/asset-depository/src/benchmarking.rs b/pallets/asset-depository/src/benchmarking.rs index 824af4875d..8430b17ed2 100644 --- a/pallets/asset-depository/src/benchmarking.rs +++ b/pallets/asset-depository/src/benchmarking.rs @@ -1,3 +1,5 @@ +// Copyright 2021 ChainSafe Systems +// SPDX-License-Identifier: LGPL-3.0-only //! Benchmarks //! //! TODO: diff --git a/pallets/asset-index/src/benchmarking.rs b/pallets/asset-index/src/benchmarking.rs index dce12047b8..caa6106bdc 100644 --- a/pallets/asset-index/src/benchmarking.rs +++ b/pallets/asset-index/src/benchmarking.rs @@ -1,8 +1,5 @@ -//! benchmarks -//! -//! add_asset -//! deposit -//! withdraw +// Copyright 2021 ChainSafe Systems +// SPDX-License-Identifier: LGPL-3.0-only use super::*; use crate::types::{AssetAvailability, IndexAssetData}; use frame_benchmarking::{benchmarks, whitelisted_caller}; @@ -44,6 +41,9 @@ benchmarks! { // assert_eq!(>::index_token_issuance(), total); } + // TODO: + // + // AssetPriceFeed not found deposit { let asset_id = 42.into(); let caller: T::AccountId = whitelisted_caller(); @@ -71,4 +71,16 @@ benchmarks! { )) ); } + + // TODO: + // + // Too complex and incompleted + // + // withdraw { + // + // }: _( + // + // ) verify { + // + // } } From d94785b8cba0ffee08918ecd82051f659d0331b3 Mon Sep 17 00:00:00 2001 From: clearloop Date: Wed, 2 Jun 2021 19:48:11 +0800 Subject: [PATCH 07/32] feat(committee): benchmark for extrinsic vote --- Cargo.lock | 1 + pallets/committee/Cargo.toml | 8 ++++ pallets/committee/src/benchmarking.rs | 58 +++++++++++++++++++++++++++ pallets/committee/src/lib.rs | 2 + runtime/src/lib.rs | 5 ++- 5 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 pallets/committee/src/benchmarking.rs diff --git a/Cargo.lock b/Cargo.lock index cd31e182f3..84c85eaf20 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4789,6 +4789,7 @@ dependencies = [ name = "pallet-committee" version = "0.0.1" dependencies = [ + "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", "pallet-balances", diff --git a/pallets/committee/Cargo.toml b/pallets/committee/Cargo.toml index c5f7263be5..8f195c3702 100644 --- a/pallets/committee/Cargo.toml +++ b/pallets/committee/Cargo.toml @@ -19,6 +19,7 @@ std = [ ] # this feature is only for compilation now runtime-benchmarks = [ + 'frame-benchmarking', 'frame-support/runtime-benchmarks', 'frame-system/runtime-benchmarks', 'sp-runtime/runtime-benchmarks', @@ -42,6 +43,13 @@ git = 'https://github.com/paritytech/substrate.git' branch = 'rococo-v1' version = '3.0.0' +[dependencies.frame-benchmarking] +default-features = false +git = 'https://github.com/paritytech/substrate.git' +branch = 'rococo-v1' +version = '3.0.0' +optional = true + [dependencies.sp-runtime] default-features = false git = 'https://github.com/paritytech/substrate.git' diff --git a/pallets/committee/src/benchmarking.rs b/pallets/committee/src/benchmarking.rs new file mode 100644 index 0000000000..ed7d797cf3 --- /dev/null +++ b/pallets/committee/src/benchmarking.rs @@ -0,0 +1,58 @@ +// Copyright 2021 ChainSafe Systems +// SPDX-License-Identifier: LGPL-3.0-only +use super::*; +use frame_benchmarking::{benchmarks, vec, whitelisted_caller, Box}; +use frame_support::assert_ok; +use frame_system::{Call as SystemCall, RawOrigin as SystemOrigin}; + +benchmarks! { + propose { + let caller: T::AccountId = whitelisted_caller(); + }: _( + SystemOrigin::Signed(caller.clone()), + Box::new(>::remark(vec![0; 0]).into()) + ) verify { + // TODO: + // + // assert_eq!( + // >::events().pop().expect("Event expected").event, + // Event::pallet_committee(crate::Event::Proposed(caller, _, _)) + // ); + } + + vote { + let caller: T::AccountId = whitelisted_caller(); + let expected_nonce = >::get(); + let action: T::Action = >::remark(vec![0; 0]).into(); + assert_ok!(>::propose( + SystemOrigin::Signed(caller.clone()).into(), + Box::new(action.clone())), + ); + + let proposal: pallet::Proposal = >::new( + expected_nonce, + action, + ); + }: _( + SystemOrigin::Signed(caller.clone()), + proposal.hash(), + Vote::Abstain + ) verify { + + } + // close { + // + // }: _( + // + // ) verify { + // + // } + // + // add_constituent { + // + // }: _( + // + // ) verify { + // + // } +} diff --git a/pallets/committee/src/lib.rs b/pallets/committee/src/lib.rs index 42bcbd4a27..4fb2128a8e 100644 --- a/pallets/committee/src/lib.rs +++ b/pallets/committee/src/lib.rs @@ -13,6 +13,8 @@ pub use pallet::*; +#[cfg(feature = "runtime-benchmarks")] +mod benchmarking; #[cfg(test)] mod mock; diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 8d8cf2e57e..03bc9eb083 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -475,8 +475,8 @@ impl pallet_committee::Config for Runtime { type VotingPeriod = VotingPeriod; type MinCouncilVotes = MinCouncilVotes; // Using root as the admin origin for now - type ProposalSubmissionOrigin = frame_system::EnsureRoot; - type ProposalExecutionOrigin = frame_system::EnsureRoot; + type ProposalSubmissionOrigin = frame_system::EnsureSigned; + type ProposalExecutionOrigin = frame_system::EnsureSigned; type ApprovedByCommitteeOrigin = EnsureApprovedByCommittee; type ProposalNonce = u32; type Origin = Origin; @@ -822,6 +822,7 @@ impl_runtime_apis! { add_benchmark!(params, batches, pallet_balances, Balances); add_benchmark!(params, batches, pallet_timestamp, Timestamp); add_benchmark!(params, batches, pallet_asset_index, AssetIndex); + add_benchmark!(params, batches, pallet_committee, Committee); if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) } Ok(batches) From 14fa3b62263684462ea6766e3a6dc2563bdf496b Mon Sep 17 00:00:00 2001 From: clearloop Date: Thu, 3 Jun 2021 13:06:40 +0800 Subject: [PATCH 08/32] feat(benchmark): benchmark for pallet local-treasury --- pallets/committee/src/benchmarking.rs | 21 ++++++++++++++++++--- pallets/local-treasury/Cargo.toml | 1 - pallets/local-treasury/src/benchmarking.rs | 20 ++++++++++++++++++++ pallets/local-treasury/src/lib.rs | 2 ++ runtime/Cargo.toml | 1 + runtime/src/lib.rs | 3 ++- 6 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 pallets/local-treasury/src/benchmarking.rs diff --git a/pallets/committee/src/benchmarking.rs b/pallets/committee/src/benchmarking.rs index ed7d797cf3..59bc27bed3 100644 --- a/pallets/committee/src/benchmarking.rs +++ b/pallets/committee/src/benchmarking.rs @@ -12,7 +12,7 @@ benchmarks! { SystemOrigin::Signed(caller.clone()), Box::new(>::remark(vec![0; 0]).into()) ) verify { - // TODO: + // TODO: verify event // // assert_eq!( // >::events().pop().expect("Event expected").event, @@ -38,16 +38,31 @@ benchmarks! { proposal.hash(), Vote::Abstain ) verify { - + // TODO: verify event + // + // assert_eq!( + // >::events().pop().expect("Event expected").event, + // Event::pallet_committee(crate::Event::Proposed(caller, _, _)) + // ); } + // close { + // let caller: T::AccountId = whitelisted_caller(); + // let action: T::Action = >::remark(vec![0; 0]).into(); + // assert_ok!(>::propose( + // SystemOrigin::Signed(caller.clone()).into(), + // Box::new(action.clone())), + // ); // + // // for i in 0..4 { + // // let voter = + // // } // }: _( // // ) verify { // // } - // + // add_constituent { // // }: _( diff --git a/pallets/local-treasury/Cargo.toml b/pallets/local-treasury/Cargo.toml index 4afc26ad66..ff59cfc830 100644 --- a/pallets/local-treasury/Cargo.toml +++ b/pallets/local-treasury/Cargo.toml @@ -16,7 +16,6 @@ std = [ 'frame-system/std', ] runtime-benchmarks = [ - 'codec/std', 'frame-benchmarking', 'frame-support/runtime-benchmarks', ] diff --git a/pallets/local-treasury/src/benchmarking.rs b/pallets/local-treasury/src/benchmarking.rs new file mode 100644 index 0000000000..a598965a84 --- /dev/null +++ b/pallets/local-treasury/src/benchmarking.rs @@ -0,0 +1,20 @@ +// Copyright 2021 ChainSafe Systems +// SPDX-License-Identifier: LGPL-3.0-only +use super::*; +use frame_benchmarking::{account, benchmarks}; +use frame_support::{sp_runtime::traits::AccountIdConversion, traits::Currency, PalletId}; +use frame_system::Origin; + +benchmarks! { + withdraw { + let local_treasury: ::AccountId = PalletId(*b"12345678").into_account(); + T::Currency::deposit_creating(&local_treasury, 10_000_000_u32.into()); + let admin: ::AccountId = account("admin", 0, 0); + }: _( + >::Signed(admin), + 10_000_u32.into(), + admin.clone() + ) verify { + + } +} diff --git a/pallets/local-treasury/src/lib.rs b/pallets/local-treasury/src/lib.rs index 4d3f0b0f41..e575beb65b 100644 --- a/pallets/local-treasury/src/lib.rs +++ b/pallets/local-treasury/src/lib.rs @@ -8,6 +8,8 @@ pub use pallet::*; #[cfg(test)] mod mock; +#[cfg(feature = "runtime-benchmarks")] +mod benchmarking; #[cfg(test)] mod tests; diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 4f0674d7d2..47276e8f2d 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -281,6 +281,7 @@ runtime-benchmarks = [ 'pallet-asset-depository/runtime-benchmarks', 'pallet-asset-index/runtime-benchmarks', 'pallet-price-feed/runtime-benchmarks', + 'pallet-local-treasury/runtime-benchmarks', 'pallet-balances/runtime-benchmarks', 'pallet-timestamp/runtime-benchmarks', 'pallet-committee/runtime-benchmarks', diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 03bc9eb083..a9951736f5 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -440,7 +440,7 @@ parameter_types! { impl pallet_local_treasury::Config for Runtime { // Using root as the admin origin for now - type AdminOrigin = frame_system::EnsureRoot; + type AdminOrigin = frame_system::EnsureSigned; type PalletId = TreasuryPalletId; type Currency = Balances; type Event = Event; @@ -823,6 +823,7 @@ impl_runtime_apis! { add_benchmark!(params, batches, pallet_timestamp, Timestamp); add_benchmark!(params, batches, pallet_asset_index, AssetIndex); add_benchmark!(params, batches, pallet_committee, Committee); + add_benchmark!(params, batches, pallet_local_treasury, LocalTreasury); if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) } Ok(batches) From 313d9d9a21e93b7a439ebc45136599ecd27b9b92 Mon Sep 17 00:00:00 2001 From: clearloop Date: Thu, 3 Jun 2021 13:56:07 +0800 Subject: [PATCH 09/32] feat(benchmark): add benchmarks to pallet price-feed --- pallets/price-feed/src/benchmarking.rs | 27 ++++++++++++++++++++++++++ pallets/price-feed/src/lib.rs | 2 ++ runtime/src/lib.rs | 11 ++++++----- 3 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 pallets/price-feed/src/benchmarking.rs diff --git a/pallets/price-feed/src/benchmarking.rs b/pallets/price-feed/src/benchmarking.rs new file mode 100644 index 0000000000..39a32f4714 --- /dev/null +++ b/pallets/price-feed/src/benchmarking.rs @@ -0,0 +1,27 @@ +// Copyright 2021 ChainSafe Systems +// SPDX-License-Identifier: LGPL-3.0-only +use super::*; +use frame_benchmarking::{benchmarks, whitelisted_caller, Zero}; +use frame_support::traits::Get; +use frame_system::Origin; + +benchmarks! { + track_asset_price_feed { + let caller: T::AccountId = whitelisted_caller(); + }: _( + >::Signed(caller.clone()), + T::SelfAssetId::get(), + Zero::zero() + ) verify { + + } + + untrack_asset_price_feed { + let caller: T::AccountId = whitelisted_caller(); + }: _( + >::Signed(caller.clone()), + T::SelfAssetId::get() + ) verify { + + } +} diff --git a/pallets/price-feed/src/lib.rs b/pallets/price-feed/src/lib.rs index 05bdd07d27..7a84cec832 100644 --- a/pallets/price-feed/src/lib.rs +++ b/pallets/price-feed/src/lib.rs @@ -10,6 +10,8 @@ mod mock; #[cfg(test)] pub use mock::FeedBuilder; +#[cfg(feature = "runtime-benchmarks")] +mod benchmarking; #[cfg(test)] mod tests; diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index a9951736f5..5628f30506 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -439,7 +439,7 @@ parameter_types! { } impl pallet_local_treasury::Config for Runtime { - // Using root as the admin origin for now + // Using signed as the admin origin for now type AdminOrigin = frame_system::EnsureSigned; type PalletId = TreasuryPalletId; type Currency = Balances; @@ -447,7 +447,7 @@ impl pallet_local_treasury::Config for Runtime { } impl pallet_saft_registry::Config for Runtime { - // Using root as the admin origin for now + // Using signed as the admin origin for now type AdminOrigin = frame_system::EnsureRoot; type Event = Event; type Balance = Balance; @@ -474,7 +474,7 @@ impl pallet_committee::Config for Runtime { type ProposalSubmissionPeriod = ProposalSubmissionPeriod; type VotingPeriod = VotingPeriod; type MinCouncilVotes = MinCouncilVotes; - // Using root as the admin origin for now + // Using signed as the admin origin for now type ProposalSubmissionOrigin = frame_system::EnsureSigned; type ProposalExecutionOrigin = frame_system::EnsureSigned; type ApprovedByCommitteeOrigin = EnsureApprovedByCommittee; @@ -491,8 +491,8 @@ impl pallet_asset_depository::Config for Runtime { } impl pallet_price_feed::Config for Runtime { - // Using root as the admin origin for now - type AdminOrigin = frame_system::EnsureRoot; + // Using signed as the admin origin for now + type AdminOrigin = frame_system::EnsureSigned; type SelfAssetId = PINTAssetId; type AssetId = AssetId; type Oracle = ChainlinkFeed; @@ -824,6 +824,7 @@ impl_runtime_apis! { add_benchmark!(params, batches, pallet_asset_index, AssetIndex); add_benchmark!(params, batches, pallet_committee, Committee); add_benchmark!(params, batches, pallet_local_treasury, LocalTreasury); + add_benchmark!(params, batches, pallet_price_feed, PriceFeed); if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) } Ok(batches) From 212578b4aada45a13627d0fdf8ab9b6d4871b827 Mon Sep 17 00:00:00 2001 From: clearloop Date: Thu, 3 Jun 2021 14:07:33 +0800 Subject: [PATCH 10/32] feat(benchmark): add benchmark to remote-asset-manager --- pallets/remote-asset-manager/src/benchmarking.rs | 16 ++++++++++++++++ pallets/remote-asset-manager/src/lib.rs | 2 ++ runtime/src/lib.rs | 1 + 3 files changed, 19 insertions(+) create mode 100644 pallets/remote-asset-manager/src/benchmarking.rs diff --git a/pallets/remote-asset-manager/src/benchmarking.rs b/pallets/remote-asset-manager/src/benchmarking.rs new file mode 100644 index 0000000000..b1efedd854 --- /dev/null +++ b/pallets/remote-asset-manager/src/benchmarking.rs @@ -0,0 +1,16 @@ +// Copyright 2021 ChainSafe Systems +// SPDX-License-Identifier: LGPL-3.0-only +use super::*; +use frame_benchmarking::{benchmarks, whitelisted_caller}; +use frame_system::Origin; + +benchmarks! { + transfer { + + }: _( + >::Signed(whitelisted_caller()), + 10_000_u32.into() + ) verify { + + } +} diff --git a/pallets/remote-asset-manager/src/lib.rs b/pallets/remote-asset-manager/src/lib.rs index 90b9cb5cfc..c05b3452e0 100644 --- a/pallets/remote-asset-manager/src/lib.rs +++ b/pallets/remote-asset-manager/src/lib.rs @@ -10,6 +10,8 @@ pub use pallet::*; +#[cfg(feature = "runtime-benchmarks")] +mod benchmarking; mod traits; #[frame_support::pallet] diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 5628f30506..1b8e262512 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -825,6 +825,7 @@ impl_runtime_apis! { add_benchmark!(params, batches, pallet_committee, Committee); add_benchmark!(params, batches, pallet_local_treasury, LocalTreasury); add_benchmark!(params, batches, pallet_price_feed, PriceFeed); + add_benchmark!(params, batches, pallet_remote_asset_manager, RemoteAssetManager); if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) } Ok(batches) From fa00361a0bf837bc21c069310dbc8b3f2229aa2e Mon Sep 17 00:00:00 2001 From: clearloop Date: Thu, 3 Jun 2021 16:44:40 +0800 Subject: [PATCH 11/32] feat(benchmark): abstract benchmarks to saft-registry --- pallets/saft-registry/src/benchmarking.rs | 35 +++++++++++++++++++++++ pallets/saft-registry/src/lib.rs | 4 ++- runtime/Cargo.toml | 1 + runtime/src/lib.rs | 1 + 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 pallets/saft-registry/src/benchmarking.rs diff --git a/pallets/saft-registry/src/benchmarking.rs b/pallets/saft-registry/src/benchmarking.rs new file mode 100644 index 0000000000..f32c579a74 --- /dev/null +++ b/pallets/saft-registry/src/benchmarking.rs @@ -0,0 +1,35 @@ +// Copyright 2021 ChainSafe Systems +// SPDX-License-Identifier: LGPL-3.0-only +use super::*; +use frame_benchmarking::{benchmarks, whitelisted_caller}; +use frame_system::Origin; + +benchmarks! { + add_saft { + let caller = whitelisted_caller(); + let asset_id: T::AssetId = 0.into(); + }: _( + >::Signed(caller), + asset_id, + 100_u32.into(), + 20_u32.into() + ) verify { + } + + remove_saft { + }: _( + >::Signed(whitelisted_caller()), + 0.into(), + 0 + ) verify { + } + + report_nav { + }: _( + >::Signed(whitelisted_caller()), + 0.into(), + 0, + 100_u32.into() + ) verify { + } +} diff --git a/pallets/saft-registry/src/lib.rs b/pallets/saft-registry/src/lib.rs index 36898cfa16..b4103f2acb 100644 --- a/pallets/saft-registry/src/lib.rs +++ b/pallets/saft-registry/src/lib.rs @@ -8,6 +8,8 @@ pub use pallet::*; #[cfg(test)] mod mock; +#[cfg(feature = "runtime-benchmarks")] +mod benchmarking; #[cfg(test)] mod tests; @@ -28,7 +30,7 @@ pub mod pallet { type AdminOrigin: EnsureOrigin; type AssetRecorder: AssetRecorder; type Balance: Parameter + AtLeast32BitUnsigned; - type AssetId: Parameter; + type AssetId: Parameter + From; type Event: From> + IsType<::Event>; } diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 47276e8f2d..752774d2af 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -286,6 +286,7 @@ runtime-benchmarks = [ 'pallet-timestamp/runtime-benchmarks', 'pallet-committee/runtime-benchmarks', 'pallet-xcm/runtime-benchmarks', + 'pallet-saft-registry/runtime-benchmarks', 'pallet-remote-asset-manager/runtime-benchmarks', 'xcm-builder/runtime-benchmarks' ] diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 1b8e262512..abec9f95f3 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -826,6 +826,7 @@ impl_runtime_apis! { add_benchmark!(params, batches, pallet_local_treasury, LocalTreasury); add_benchmark!(params, batches, pallet_price_feed, PriceFeed); add_benchmark!(params, batches, pallet_remote_asset_manager, RemoteAssetManager); + add_benchmark!(params, batches, pallet_saft_registry, SaftRegistry); if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) } Ok(batches) From ba1d0dbcacc5e5c95d28fdfea2707ac5676c72b7 Mon Sep 17 00:00:00 2001 From: clearloop Date: Thu, 3 Jun 2021 18:56:15 +0800 Subject: [PATCH 12/32] feat(benchmark): complete benchmarks of committee --- pallets/committee/Cargo.toml | 1 - pallets/committee/src/benchmarking.rs | 74 +++++++++---------- .../remote-asset-manager/src/benchmarking.rs | 1 - runtime/src/lib.rs | 10 +-- 4 files changed, 39 insertions(+), 47 deletions(-) diff --git a/pallets/committee/Cargo.toml b/pallets/committee/Cargo.toml index 8f195c3702..b1d4728944 100644 --- a/pallets/committee/Cargo.toml +++ b/pallets/committee/Cargo.toml @@ -17,7 +17,6 @@ std = [ 'frame-system/std', 'sp-runtime/std', ] -# this feature is only for compilation now runtime-benchmarks = [ 'frame-benchmarking', 'frame-support/runtime-benchmarks', diff --git a/pallets/committee/src/benchmarking.rs b/pallets/committee/src/benchmarking.rs index 59bc27bed3..1ace3e2718 100644 --- a/pallets/committee/src/benchmarking.rs +++ b/pallets/committee/src/benchmarking.rs @@ -5,69 +5,63 @@ use frame_benchmarking::{benchmarks, vec, whitelisted_caller, Box}; use frame_support::assert_ok; use frame_system::{Call as SystemCall, RawOrigin as SystemOrigin}; +fn submit_proposal() -> pallet::Proposal { + let action: T::Action = >::remark(vec![0; 0]).into(); + let expected_nonce = pallet::ProposalCount::::get(); + assert_ok!(>::propose( + SystemOrigin::Root.into(), + Box::new(action.clone()) + )); + pallet::Proposal::::new(expected_nonce, action) +} + benchmarks! { propose { let caller: T::AccountId = whitelisted_caller(); }: _( - SystemOrigin::Signed(caller.clone()), + SystemOrigin::Root, Box::new(>::remark(vec![0; 0]).into()) ) verify { - // TODO: verify event + // TODO: // - // assert_eq!( - // >::events().pop().expect("Event expected").event, - // Event::pallet_committee(crate::Event::Proposed(caller, _, _)) - // ); + // verify last event + } vote { let caller: T::AccountId = whitelisted_caller(); - let expected_nonce = >::get(); - let action: T::Action = >::remark(vec![0; 0]).into(); - assert_ok!(>::propose( - SystemOrigin::Signed(caller.clone()).into(), - Box::new(action.clone())), - ); - - let proposal: pallet::Proposal = >::new( - expected_nonce, - action, - ); + let proposal = submit_proposal::(); }: _( - SystemOrigin::Signed(caller.clone()), + SystemOrigin::Root, proposal.hash(), Vote::Abstain ) verify { - // TODO: verify event + // TODO: + // + // verify last event + } + + close { + let caller: T::AccountId = whitelisted_caller(); + }: _( + SystemOrigin::Root, + submit_proposal::().hash() + ) verify { + // TODO: // - // assert_eq!( - // >::events().pop().expect("Event expected").event, - // Event::pallet_committee(crate::Event::Proposed(caller, _, _)) - // ); + // verify last event } - // close { - // let caller: T::AccountId = whitelisted_caller(); - // let action: T::Action = >::remark(vec![0; 0]).into(); - // assert_ok!(>::propose( - // SystemOrigin::Signed(caller.clone()).into(), - // Box::new(action.clone())), - // ); + // TODO: // - // // for i in 0..4 { - // // let voter = - // // } - // }: _( + // This is hard to benchmark limited by the `Call` in environment. // - // ) verify { + // Use the weight of `propose` currently // - // } - - // add_constituent { // - // }: _( + // add_constituent { // - // ) verify { + // }: _() verify { // // } } diff --git a/pallets/remote-asset-manager/src/benchmarking.rs b/pallets/remote-asset-manager/src/benchmarking.rs index b1efedd854..0456a88633 100644 --- a/pallets/remote-asset-manager/src/benchmarking.rs +++ b/pallets/remote-asset-manager/src/benchmarking.rs @@ -6,7 +6,6 @@ use frame_system::Origin; benchmarks! { transfer { - }: _( >::Signed(whitelisted_caller()), 10_000_u32.into() diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index abec9f95f3..888ae03094 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -474,9 +474,9 @@ impl pallet_committee::Config for Runtime { type ProposalSubmissionPeriod = ProposalSubmissionPeriod; type VotingPeriod = VotingPeriod; type MinCouncilVotes = MinCouncilVotes; - // Using signed as the admin origin for now - type ProposalSubmissionOrigin = frame_system::EnsureSigned; - type ProposalExecutionOrigin = frame_system::EnsureSigned; + // Using root as the admin origin for now + type ProposalSubmissionOrigin = frame_system::EnsureRoot; + type ProposalExecutionOrigin = frame_system::EnsureRoot; type ApprovedByCommitteeOrigin = EnsureApprovedByCommittee; type ProposalNonce = u32; type Origin = Origin; @@ -491,8 +491,8 @@ impl pallet_asset_depository::Config for Runtime { } impl pallet_price_feed::Config for Runtime { - // Using signed as the admin origin for now - type AdminOrigin = frame_system::EnsureSigned; + // Using root as the admin origin for now + type AdminOrigin = frame_system::EnsureRoot; type SelfAssetId = PINTAssetId; type AssetId = AssetId; type Oracle = ChainlinkFeed; From 02b67c3113fb597b104f6562cb1c697bdb521132 Mon Sep 17 00:00:00 2001 From: clearloop Date: Thu, 3 Jun 2021 20:39:17 +0800 Subject: [PATCH 13/32] feat(weights): add weights of asset-index to runtime --- pallets/asset-index/src/benchmarking.rs | 58 ++++++++++++----------- pallets/asset-index/src/lib.rs | 10 +++- runtime/src/lib.rs | 6 ++- runtime/src/weights/mod.rs | 1 + runtime/src/weights/pallet_asset_index.rs | 38 +++++++++++++++ 5 files changed, 82 insertions(+), 31 deletions(-) create mode 100644 runtime/src/weights/mod.rs create mode 100644 runtime/src/weights/pallet_asset_index.rs diff --git a/pallets/asset-index/src/benchmarking.rs b/pallets/asset-index/src/benchmarking.rs index caa6106bdc..334c892c38 100644 --- a/pallets/asset-index/src/benchmarking.rs +++ b/pallets/asset-index/src/benchmarking.rs @@ -3,7 +3,7 @@ use super::*; use crate::types::{AssetAvailability, IndexAssetData}; use frame_benchmarking::{benchmarks, whitelisted_caller}; -use frame_support::{assert_ok, traits::Currency}; +use frame_support::traits::Currency; use frame_system::RawOrigin; use xcm::v0::MultiLocation; @@ -44,33 +44,35 @@ benchmarks! { // TODO: // // AssetPriceFeed not found - deposit { - let asset_id = 42.into(); - let caller: T::AccountId = whitelisted_caller(); - let million = 1_000_000u32.into(); - T::IndexToken::deposit_creating(&caller, million); - - // add_asset - assert_ok!(>::add_asset( - RawOrigin::Signed(caller.clone()).into(), - asset_id, - million, - AssetAvailability::Liquid(MultiLocation::Null), - million - )); - }: _( - RawOrigin::Signed(caller.clone()), - asset_id, - million - ) verify { - assert_eq!( - >::get(asset_id), - Some(IndexAssetData::new( - million + million, - AssetAvailability::Liquid(MultiLocation::Null) - )) - ); - } + // + // + // deposit { + // let asset_id = 42.into(); + // let caller: T::AccountId = whitelisted_caller(); + // let million = 1_000_000u32.into(); + // T::IndexToken::deposit_creating(&caller, million); + // + // // add_asset + // assert_ok!(>::add_asset( + // RawOrigin::Signed(caller.clone()).into(), + // asset_id, + // million, + // AssetAvailability::Liquid(MultiLocation::Null), + // million + // )); + // }: _( + // RawOrigin::Signed(caller.clone()), + // asset_id, + // million + // ) verify { + // assert_eq!( + // >::get(asset_id), + // Some(IndexAssetData::new( + // million + million, + // AssetAvailability::Liquid(MultiLocation::Null) + // )) + // ); + // } // TODO: // diff --git a/pallets/asset-index/src/lib.rs b/pallets/asset-index/src/lib.rs index c513b65367..0b4a0913da 100644 --- a/pallets/asset-index/src/lib.rs +++ b/pallets/asset-index/src/lib.rs @@ -104,6 +104,9 @@ pub mod pallet { #[pallet::constant] type TreasuryPalletId: Get; type Event: From> + IsType<::Event>; + + /// The weight for this pallet's extrinsics. + type WeightInfo: WeightInfo; } #[pallet::pallet] @@ -161,7 +164,7 @@ pub mod pallet { #[pallet::call] impl Pallet { - #[pallet::weight(10_000)] // TODO: Set weights + #[pallet::weight(T::WeightInfo::add_asset())] // TODO: Set weights /// Callable by an admin to add new assets to the index and mint some IndexToken /// Caller balance is updated to allocate the correct amount of the IndexToken /// Creates IndexAssetData if it doesn’t exist, otherwise adds to list of deposits @@ -474,4 +477,9 @@ pub mod pallet { .unwrap_or_default() } } + + /// Trait for the asset-index pallet extrinsic weights. + pub trait WeightInfo { + fn add_asset() -> Weight; + } } diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 888ae03094..534a6db01b 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -93,6 +93,9 @@ pub type FeedId = u64; /// Value type for price feeds. pub type Value = u128; +/// Weights of pallets +mod weights; + /// Opaque types. These are used by the CLI to instantiate machinery that don't need to know /// the specifics of the runtime. They can then be made to be agnostic over specific formats /// of data like extrinsics, allowing for them to continue syncing the network through upgrades @@ -536,8 +539,6 @@ parameter_types! { } impl pallet_asset_index::Config for Runtime { - // TODO: - // // Using signed as the admin origin for testing now type AdminOrigin = frame_system::EnsureSigned; type Event = Event; @@ -553,6 +554,7 @@ impl pallet_asset_index::Config for Runtime { type PriceFeed = PriceFeed; type TreasuryPalletId = TreasuryPalletId; type WithdrawalFee = (); + type WeightInfo = weights::pallet_asset_index::WeightInfo; } parameter_types! { diff --git a/runtime/src/weights/mod.rs b/runtime/src/weights/mod.rs new file mode 100644 index 0000000000..13413c8751 --- /dev/null +++ b/runtime/src/weights/mod.rs @@ -0,0 +1 @@ +pub mod pallet_asset_index; diff --git a/runtime/src/weights/pallet_asset_index.rs b/runtime/src/weights/pallet_asset_index.rs new file mode 100644 index 0000000000..66ba14c28f --- /dev/null +++ b/runtime/src/weights/pallet_asset_index.rs @@ -0,0 +1,38 @@ + +//! Autogenerated weights for pallet_asset_index +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 +//! DATE: 2021-06-03, STEPS: `[]`, REPEAT: 1, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 128 + +// Executed Command: +// ./target/release/pint +// benchmark +// --execution +// wasm +// --wasm-execution +// compiled +// -p +// pallet_asset_index +// -e +// * +// --raw +// --output +// runtime/src/weights/pallet_asset_index.rs + + +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Weight functions for pallet_asset_index. +pub struct WeightInfo(PhantomData); +impl pallet_asset_index::WeightInfo for WeightInfo { + fn add_asset() -> Weight { + (32_000_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } +} From 3a71256a55839d48e9b1f039378f136a49044a4d Mon Sep 17 00:00:00 2001 From: clearloop Date: Thu, 3 Jun 2021 20:49:13 +0800 Subject: [PATCH 14/32] feat(benchmark): add weights of remote-asset-registry to runtime --- pallets/remote-asset-manager/src/lib.rs | 8 +++++ runtime/src/lib.rs | 1 + runtime/src/weights/mod.rs | 1 + .../weights/pallet_remote_asset_manager.rs | 36 +++++++++++++++++++ runtime/src/weights/pallet_saft_registry.rs | 36 +++++++++++++++++++ 5 files changed, 82 insertions(+) create mode 100644 runtime/src/weights/pallet_remote_asset_manager.rs create mode 100644 runtime/src/weights/pallet_saft_registry.rs diff --git a/pallets/remote-asset-manager/src/lib.rs b/pallets/remote-asset-manager/src/lib.rs index c05b3452e0..4eeacec81a 100644 --- a/pallets/remote-asset-manager/src/lib.rs +++ b/pallets/remote-asset-manager/src/lib.rs @@ -68,6 +68,9 @@ pub mod pallet { type XcmExecutor: ExecuteXcm; type Event: From> + IsType<::Event>; + + /// The weight for this pallet's extrinsics. + type WeightInfo: WeightInfo; } #[pallet::pallet] @@ -112,4 +115,9 @@ pub mod pallet { Ok(()) } } + + /// Trait for the asset-index pallet extrinsic weights. + pub trait WeightInfo { + fn transfer() -> Weight; + } } diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 534a6db01b..1a5dc16f71 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -632,6 +632,7 @@ impl pallet_remote_asset_manager::Config for Runtime { type RelayChainAssetId = RelayChainAssetId; type XcmExecutor = XcmExecutor; type Event = Event; + type WeightInfo = weights::pallet_remote_asset_manager::WeightInfo; } // Create the runtime by composing the FRAME pallets that were previously configured. diff --git a/runtime/src/weights/mod.rs b/runtime/src/weights/mod.rs index 13413c8751..9349b4304a 100644 --- a/runtime/src/weights/mod.rs +++ b/runtime/src/weights/mod.rs @@ -1 +1,2 @@ pub mod pallet_asset_index; +pub mod pallet_remote_asset_manager; diff --git a/runtime/src/weights/pallet_remote_asset_manager.rs b/runtime/src/weights/pallet_remote_asset_manager.rs new file mode 100644 index 0000000000..1b064dfa75 --- /dev/null +++ b/runtime/src/weights/pallet_remote_asset_manager.rs @@ -0,0 +1,36 @@ + +//! Autogenerated weights for pallet_remote_asset_manager +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 +//! DATE: 2021-06-03, STEPS: `[]`, REPEAT: 1, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 128 + +// Executed Command: +// ./target/release/pint +// benchmark +// --execution +// wasm +// --wasm-execution +// compiled +// -p +// pallet_remote_asset_manager +// -e +// * +// --raw +// --output +// runtime/src/weights/pallet_remote_asset_manager.rs + + +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Weight functions for pallet_remote_asset_manager. +pub struct WeightInfo(PhantomData); +impl pallet_remote_asset_manager::WeightInfo for WeightInfo { + fn transfer() -> Weight { + (2_000_000 as Weight) + } +} diff --git a/runtime/src/weights/pallet_saft_registry.rs b/runtime/src/weights/pallet_saft_registry.rs new file mode 100644 index 0000000000..a09b40fa19 --- /dev/null +++ b/runtime/src/weights/pallet_saft_registry.rs @@ -0,0 +1,36 @@ + +//! Autogenerated weights for pallet_remote_asset_manager +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 +//! DATE: 2021-06-03, STEPS: `[]`, REPEAT: 1, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 128 + +// Executed Command: +// ./target/release/pint +// benchmark +// --execution +// wasm +// --wasm-execution +// compiled +// -p +// pallet_remote_asset_manager +// -e +// * +// --raw +// --output +// runtime/src/weights/pallet_saft_registry.rs + + +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Weight functions for pallet_remote_asset_manager. +pub struct WeightInfo(PhantomData); +impl pallet_remote_asset_manager::WeightInfo for WeightInfo { + fn transfer() -> Weight { + (2_000_000 as Weight) + } +} From 59657305c457fef0467f0561dc393f3b7f263eea Mon Sep 17 00:00:00 2001 From: clearloop Date: Thu, 3 Jun 2021 21:12:44 +0800 Subject: [PATCH 15/32] feat(benchmark): add weights of local-treasury to runtime --- pallets/local-treasury/src/lib.rs | 10 +++++- runtime/src/lib.rs | 1 + runtime/src/weights/mod.rs | 1 + runtime/src/weights/pallet_local_treasury.rs | 38 ++++++++++++++++++++ 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 runtime/src/weights/pallet_local_treasury.rs diff --git a/pallets/local-treasury/src/lib.rs b/pallets/local-treasury/src/lib.rs index e575beb65b..f894eaccda 100644 --- a/pallets/local-treasury/src/lib.rs +++ b/pallets/local-treasury/src/lib.rs @@ -40,6 +40,9 @@ pub mod pallet { /// The pallet to use as the base currency for this treasury type Currency: Currency; type Event: From> + IsType<::Event>; + + /// The weight for this pallet's extrinsics. + type WeightInfo: WeightInfo; } #[pallet::pallet] @@ -73,7 +76,7 @@ pub mod pallet { #[pallet::call] impl Pallet { /// Transfer balance from the treasury to another account. Only callable by the AdminOrigin. - #[pallet::weight(10_000)] // TODO: Set weights + #[pallet::weight(T::WeightInfo::withdraw())] // TODO: Set weights pub fn withdraw( origin: OriginFor, amount: BalanceFor, @@ -88,4 +91,9 @@ pub mod pallet { Ok(().into()) } } + + /// Trait for the asset-index pallet extrinsic weights. + pub trait WeightInfo { + fn withdraw() -> Weight; + } } diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 1a5dc16f71..7aef037827 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -447,6 +447,7 @@ impl pallet_local_treasury::Config for Runtime { type PalletId = TreasuryPalletId; type Currency = Balances; type Event = Event; + type WeightInfo = weights::pallet_local_treasury::WeightInfo; } impl pallet_saft_registry::Config for Runtime { diff --git a/runtime/src/weights/mod.rs b/runtime/src/weights/mod.rs index 9349b4304a..5112375388 100644 --- a/runtime/src/weights/mod.rs +++ b/runtime/src/weights/mod.rs @@ -1,2 +1,3 @@ pub mod pallet_asset_index; +pub mod pallet_local_treasury; pub mod pallet_remote_asset_manager; diff --git a/runtime/src/weights/pallet_local_treasury.rs b/runtime/src/weights/pallet_local_treasury.rs new file mode 100644 index 0000000000..262cfe2629 --- /dev/null +++ b/runtime/src/weights/pallet_local_treasury.rs @@ -0,0 +1,38 @@ + +//! Autogenerated weights for pallet_local_treasury +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 +//! DATE: 2021-06-03, STEPS: `[]`, REPEAT: 1, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 128 + +// Executed Command: +// ./target/release/pint +// benchmark +// --execution +// wasm +// --wasm-execution +// compiled +// -p +// pallet_local_treasury +// -e +// * +// --raw +// --output +// runtime/src/weights/pallet_local_treasury.rs + + +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Weight functions for pallet_local_treasury. +pub struct WeightInfo(PhantomData); +impl pallet_local_treasury::WeightInfo for WeightInfo { + fn withdraw() -> Weight { + (52_000_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } +} From fa70208b0227327c75584884e635067d64aa9121 Mon Sep 17 00:00:00 2001 From: clearloop Date: Fri, 4 Jun 2021 00:27:07 +0800 Subject: [PATCH 16/32] feat(benchmarks): add default weight for tests --- pallets/asset-index/src/default_weights.rs | 36 +++++++++++++++++++ pallets/asset-index/src/lib.rs | 8 +++++ pallets/asset-index/src/mock.rs | 1 + pallets/asset-index/src/weights.rs | 41 ++++++++++++++++++++++ pallets/local-treasury/src/lib.rs | 7 ++++ pallets/local-treasury/src/mock.rs | 1 + 6 files changed, 94 insertions(+) create mode 100644 pallets/asset-index/src/default_weights.rs create mode 100644 pallets/asset-index/src/weights.rs diff --git a/pallets/asset-index/src/default_weights.rs b/pallets/asset-index/src/default_weights.rs new file mode 100644 index 0000000000..ee1bf3f302 --- /dev/null +++ b/pallets/asset-index/src/default_weights.rs @@ -0,0 +1,36 @@ +//! Autogenerated weights for pallet_asset_index +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 +//! DATE: 2021-06-03, STEPS: `[]`, REPEAT: 1, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 128 + +// Executed Command: +// ./target/release/pint +// benchmark +// --execution +// wasm +// --wasm-execution +// compiled +// -p +// pallet_asset_index +// -e +// * +// --raw +// --output +// runtime/src/weights/pallet_asset_index.rs + +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Weight functions for pallet_asset_index. +pub struct WeightInfo(PhantomData); +impl crate::WeightInfo for WeightInfo { + fn add_asset() -> Weight { + (32_000_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } +} diff --git a/pallets/asset-index/src/lib.rs b/pallets/asset-index/src/lib.rs index 0b4a0913da..5061e3a769 100644 --- a/pallets/asset-index/src/lib.rs +++ b/pallets/asset-index/src/lib.rs @@ -17,6 +17,7 @@ mod tests; #[cfg(feature = "runtime-benchmarks")] mod benchmarking; +mod default_weights; pub mod traits; mod types; @@ -482,4 +483,11 @@ pub mod pallet { pub trait WeightInfo { fn add_asset() -> Weight; } + + /// For backwards compatibility and tests + impl WeightInfo for () { + fn add_asset() -> Weight { + Default::default() + } + } } diff --git a/pallets/asset-index/src/mock.rs b/pallets/asset-index/src/mock.rs index 9cadf32924..edb73b2ea6 100644 --- a/pallets/asset-index/src/mock.rs +++ b/pallets/asset-index/src/mock.rs @@ -140,6 +140,7 @@ impl pallet_asset_index::Config for Test { type PriceFeed = MockPriceFeed; type TreasuryPalletId = TreasuryPalletId; type WithdrawalFee = (); + type WeightInfo = (); } pub struct MockRemoteAssetManager; diff --git a/pallets/asset-index/src/weights.rs b/pallets/asset-index/src/weights.rs new file mode 100644 index 0000000000..5025b09200 --- /dev/null +++ b/pallets/asset-index/src/weights.rs @@ -0,0 +1,41 @@ +//! Autogenerated weights for pallet_asset_index +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 +//! DATE: 2021-06-03, STEPS: `[]`, REPEAT: 1, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 128 + +// Executed Command: +// ./target/release/pint +// benchmark +// --execution +// wasm +// --wasm-execution +// compiled +// -p +// pallet_asset_index +// -e +// * +// --raw +// --output +// runtime/src/weights/pallet_asset_index.rs + +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Trait for the asset-index pallet extrinsic weights. +pub trait WeightInfo { + fn add_asset() -> Weight; +} + +/// Weight functions for pallet_asset_index. +pub struct WeightInfo(PhantomData); +impl pallet_asset_index::WeightInfo for WeightInfo { + fn add_asset() -> Weight { + (32_000_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } +} diff --git a/pallets/local-treasury/src/lib.rs b/pallets/local-treasury/src/lib.rs index f894eaccda..269dd6b4dd 100644 --- a/pallets/local-treasury/src/lib.rs +++ b/pallets/local-treasury/src/lib.rs @@ -96,4 +96,11 @@ pub mod pallet { pub trait WeightInfo { fn withdraw() -> Weight; } + + /// For backwards compatibility and tests + impl WeightInfo for () { + fn withdraw() -> Weight { + Default::default() + } + } } diff --git a/pallets/local-treasury/src/mock.rs b/pallets/local-treasury/src/mock.rs index 9067e96762..470fa7e7b2 100644 --- a/pallets/local-treasury/src/mock.rs +++ b/pallets/local-treasury/src/mock.rs @@ -101,6 +101,7 @@ impl pallet_local_treasury::Config for Test { type PalletId = TestPalletId; type Currency = Balances; type Event = Event; + type WeightInfo = (); } pub fn local_treasury_account_id() -> AccountId { From df93419150f378ee69db87b3c83360a4ee9bd864 Mon Sep 17 00:00:00 2001 From: clearloop Date: Fri, 4 Jun 2021 00:32:02 +0800 Subject: [PATCH 17/32] chore(weights): add license to weight files --- pallets/asset-index/src/default_weights.rs | 36 ---------------- pallets/asset-index/src/lib.rs | 1 - pallets/asset-index/src/weights.rs | 41 ------------------- runtime/src/weights/mod.rs | 2 + runtime/src/weights/pallet_asset_index.rs | 13 +++--- runtime/src/weights/pallet_local_treasury.rs | 13 +++--- .../weights/pallet_remote_asset_manager.rs | 9 ++-- runtime/src/weights/pallet_saft_registry.rs | 9 ++-- 8 files changed, 26 insertions(+), 98 deletions(-) delete mode 100644 pallets/asset-index/src/default_weights.rs delete mode 100644 pallets/asset-index/src/weights.rs diff --git a/pallets/asset-index/src/default_weights.rs b/pallets/asset-index/src/default_weights.rs deleted file mode 100644 index ee1bf3f302..0000000000 --- a/pallets/asset-index/src/default_weights.rs +++ /dev/null @@ -1,36 +0,0 @@ -//! Autogenerated weights for pallet_asset_index -//! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-06-03, STEPS: `[]`, REPEAT: 1, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 128 - -// Executed Command: -// ./target/release/pint -// benchmark -// --execution -// wasm -// --wasm-execution -// compiled -// -p -// pallet_asset_index -// -e -// * -// --raw -// --output -// runtime/src/weights/pallet_asset_index.rs - -#![allow(unused_parens)] -#![allow(unused_imports)] - -use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; - -/// Weight functions for pallet_asset_index. -pub struct WeightInfo(PhantomData); -impl crate::WeightInfo for WeightInfo { - fn add_asset() -> Weight { - (32_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } -} diff --git a/pallets/asset-index/src/lib.rs b/pallets/asset-index/src/lib.rs index 5061e3a769..8929d4f68a 100644 --- a/pallets/asset-index/src/lib.rs +++ b/pallets/asset-index/src/lib.rs @@ -17,7 +17,6 @@ mod tests; #[cfg(feature = "runtime-benchmarks")] mod benchmarking; -mod default_weights; pub mod traits; mod types; diff --git a/pallets/asset-index/src/weights.rs b/pallets/asset-index/src/weights.rs deleted file mode 100644 index 5025b09200..0000000000 --- a/pallets/asset-index/src/weights.rs +++ /dev/null @@ -1,41 +0,0 @@ -//! Autogenerated weights for pallet_asset_index -//! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-06-03, STEPS: `[]`, REPEAT: 1, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 128 - -// Executed Command: -// ./target/release/pint -// benchmark -// --execution -// wasm -// --wasm-execution -// compiled -// -p -// pallet_asset_index -// -e -// * -// --raw -// --output -// runtime/src/weights/pallet_asset_index.rs - -#![allow(unused_parens)] -#![allow(unused_imports)] - -use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; - -/// Trait for the asset-index pallet extrinsic weights. -pub trait WeightInfo { - fn add_asset() -> Weight; -} - -/// Weight functions for pallet_asset_index. -pub struct WeightInfo(PhantomData); -impl pallet_asset_index::WeightInfo for WeightInfo { - fn add_asset() -> Weight { - (32_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } -} diff --git a/runtime/src/weights/mod.rs b/runtime/src/weights/mod.rs index 5112375388..517611d9fd 100644 --- a/runtime/src/weights/mod.rs +++ b/runtime/src/weights/mod.rs @@ -1,3 +1,5 @@ +// Copyright 2021 ChainSafe Systems +// SPDX-License-Identifier: LGPL-3.0-only pub mod pallet_asset_index; pub mod pallet_local_treasury; pub mod pallet_remote_asset_manager; diff --git a/runtime/src/weights/pallet_asset_index.rs b/runtime/src/weights/pallet_asset_index.rs index 66ba14c28f..75fb757cfd 100644 --- a/runtime/src/weights/pallet_asset_index.rs +++ b/runtime/src/weights/pallet_asset_index.rs @@ -1,3 +1,5 @@ +// Copyright 2021 ChainSafe Systems +// SPDX-License-Identifier: LGPL-3.0-only //! Autogenerated weights for pallet_asset_index //! @@ -20,7 +22,6 @@ // --output // runtime/src/weights/pallet_asset_index.rs - #![allow(unused_parens)] #![allow(unused_imports)] @@ -30,9 +31,9 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_asset_index. pub struct WeightInfo(PhantomData); impl pallet_asset_index::WeightInfo for WeightInfo { - fn add_asset() -> Weight { - (32_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } + fn add_asset() -> Weight { + (32_000_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } } diff --git a/runtime/src/weights/pallet_local_treasury.rs b/runtime/src/weights/pallet_local_treasury.rs index 262cfe2629..41fb14f608 100644 --- a/runtime/src/weights/pallet_local_treasury.rs +++ b/runtime/src/weights/pallet_local_treasury.rs @@ -1,3 +1,5 @@ +// Copyright 2021 ChainSafe Systems +// SPDX-License-Identifier: LGPL-3.0-only //! Autogenerated weights for pallet_local_treasury //! @@ -20,7 +22,6 @@ // --output // runtime/src/weights/pallet_local_treasury.rs - #![allow(unused_parens)] #![allow(unused_imports)] @@ -30,9 +31,9 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_local_treasury. pub struct WeightInfo(PhantomData); impl pallet_local_treasury::WeightInfo for WeightInfo { - fn withdraw() -> Weight { - (52_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } + fn withdraw() -> Weight { + (52_000_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } } diff --git a/runtime/src/weights/pallet_remote_asset_manager.rs b/runtime/src/weights/pallet_remote_asset_manager.rs index 1b064dfa75..b79cbf2d35 100644 --- a/runtime/src/weights/pallet_remote_asset_manager.rs +++ b/runtime/src/weights/pallet_remote_asset_manager.rs @@ -1,3 +1,5 @@ +// Copyright 2021 ChainSafe Systems +// SPDX-License-Identifier: LGPL-3.0-only //! Autogenerated weights for pallet_remote_asset_manager //! @@ -20,7 +22,6 @@ // --output // runtime/src/weights/pallet_remote_asset_manager.rs - #![allow(unused_parens)] #![allow(unused_imports)] @@ -30,7 +31,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_remote_asset_manager. pub struct WeightInfo(PhantomData); impl pallet_remote_asset_manager::WeightInfo for WeightInfo { - fn transfer() -> Weight { - (2_000_000 as Weight) - } + fn transfer() -> Weight { + (2_000_000 as Weight) + } } diff --git a/runtime/src/weights/pallet_saft_registry.rs b/runtime/src/weights/pallet_saft_registry.rs index a09b40fa19..b5f7234495 100644 --- a/runtime/src/weights/pallet_saft_registry.rs +++ b/runtime/src/weights/pallet_saft_registry.rs @@ -1,3 +1,5 @@ +// Copyright 2021 ChainSafe Systems +// SPDX-License-Identifier: LGPL-3.0-only //! Autogenerated weights for pallet_remote_asset_manager //! @@ -20,7 +22,6 @@ // --output // runtime/src/weights/pallet_saft_registry.rs - #![allow(unused_parens)] #![allow(unused_imports)] @@ -30,7 +31,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_remote_asset_manager. pub struct WeightInfo(PhantomData); impl pallet_remote_asset_manager::WeightInfo for WeightInfo { - fn transfer() -> Weight { - (2_000_000 as Weight) - } + fn transfer() -> Weight { + (2_000_000 as Weight) + } } From f1a4de97a65b31b79ccc4e9fb106cabac7390026 Mon Sep 17 00:00:00 2001 From: clearloop Date: Fri, 4 Jun 2021 00:59:03 +0800 Subject: [PATCH 18/32] feat(benchmark): add default weight to pallet committee --- pallets/committee/src/lib.rs | 25 +++++++++++++++++++++++++ pallets/committee/src/mock.rs | 1 + runtime/src/lib.rs | 1 + 3 files changed, 27 insertions(+) diff --git a/pallets/committee/src/lib.rs b/pallets/committee/src/lib.rs index 4fb2128a8e..892000c88b 100644 --- a/pallets/committee/src/lib.rs +++ b/pallets/committee/src/lib.rs @@ -85,6 +85,9 @@ pub mod pallet { type ApprovedByCommitteeOrigin: EnsureOrigin<::Origin>; type Event: From> + IsType<::Event>; + + /// The weight for this pallet's extrinsics. + type WeightInfo: WeightInfo; } pub type Origin = CommitteeOrigin, BlockNumberFor>; @@ -460,4 +463,26 @@ pub mod pallet { Ok(().into()) } } + + /// Trait for the asset-index pallet extrinsic weights. + pub trait WeightInfo { + fn propose() -> Weight; + fn vote() -> Weight; + fn close() -> Weight; + } + + /// For backwards compatibility and tests + impl WeightInfo for () { + fn propose() -> Weight { + Default::default() + } + + fn vote() -> Weight { + Default::default() + } + + fn close() -> Weight { + Default::default() + } + } } diff --git a/pallets/committee/src/mock.rs b/pallets/committee/src/mock.rs index bd2c476f93..31cf4ec143 100644 --- a/pallets/committee/src/mock.rs +++ b/pallets/committee/src/mock.rs @@ -102,6 +102,7 @@ impl pallet_committee::Config for Test { type Origin = Origin; type Action = Call; type Event = Event; + type WeightInfo = (); } pub fn run_to_block(n: u64) { diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 7aef037827..84be35d8a0 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -486,6 +486,7 @@ impl pallet_committee::Config for Runtime { type Origin = Origin; type Action = Call; type Event = Event; + // type WeightInfo = } impl pallet_asset_depository::Config for Runtime { From aa7661785ef095c0b9c63e1d5ab031beefe430bb Mon Sep 17 00:00:00 2001 From: clearloop Date: Fri, 4 Jun 2021 01:44:47 +0800 Subject: [PATCH 19/32] feat(benchmark): add default weights to pallet price feed --- pallets/committee/src/lib.rs | 4 +-- pallets/committee/src/mock.rs | 2 +- pallets/price-feed/src/benchmarking.rs | 6 ++-- pallets/price-feed/src/lib.rs | 20 +++++++++++ pallets/price-feed/src/mock.rs | 1 + runtime/src/lib.rs | 1 + runtime/src/weights/mod.rs | 1 + runtime/src/weights/pallet_price_feed.rs | 42 ++++++++++++++++++++++++ 8 files changed, 70 insertions(+), 7 deletions(-) create mode 100644 runtime/src/weights/pallet_price_feed.rs diff --git a/pallets/committee/src/lib.rs b/pallets/committee/src/lib.rs index 892000c88b..db3cab659f 100644 --- a/pallets/committee/src/lib.rs +++ b/pallets/committee/src/lib.rs @@ -86,8 +86,8 @@ pub mod pallet { type Event: From> + IsType<::Event>; - /// The weight for this pallet's extrinsics. - type WeightInfo: WeightInfo; + // /// The weight for this pallet's extrinsics. + // type WeightInfo: WeightInfo; } pub type Origin = CommitteeOrigin, BlockNumberFor>; diff --git a/pallets/committee/src/mock.rs b/pallets/committee/src/mock.rs index 31cf4ec143..576b35cd1b 100644 --- a/pallets/committee/src/mock.rs +++ b/pallets/committee/src/mock.rs @@ -102,7 +102,7 @@ impl pallet_committee::Config for Test { type Origin = Origin; type Action = Call; type Event = Event; - type WeightInfo = (); + // type WeightInfo = (); } pub fn run_to_block(n: u64) { diff --git a/pallets/price-feed/src/benchmarking.rs b/pallets/price-feed/src/benchmarking.rs index 39a32f4714..20b1058b55 100644 --- a/pallets/price-feed/src/benchmarking.rs +++ b/pallets/price-feed/src/benchmarking.rs @@ -7,9 +7,8 @@ use frame_system::Origin; benchmarks! { track_asset_price_feed { - let caller: T::AccountId = whitelisted_caller(); }: _( - >::Signed(caller.clone()), + >::Root, T::SelfAssetId::get(), Zero::zero() ) verify { @@ -17,9 +16,8 @@ benchmarks! { } untrack_asset_price_feed { - let caller: T::AccountId = whitelisted_caller(); }: _( - >::Signed(caller.clone()), + >::Root, T::SelfAssetId::get() ) verify { diff --git a/pallets/price-feed/src/lib.rs b/pallets/price-feed/src/lib.rs index 7a84cec832..21afa7290d 100644 --- a/pallets/price-feed/src/lib.rs +++ b/pallets/price-feed/src/lib.rs @@ -62,6 +62,9 @@ pub mod pallet { type Oracle: FeedOracle; type Event: From> + IsType<::Event>; + + /// The weight for this pallet's extrinsics. + type WeightInfo: WeightInfo; } #[pallet::pallet] @@ -270,4 +273,21 @@ pub mod pallet { Ok(AssetPricePair { base, quote, price }) } } + + /// Trait for the asset-index pallet extrinsic weights. + pub trait WeightInfo { + fn track_asset_price_feed() -> Weight; + fn untrack_asset_price_feed() -> Weight; + } + + /// For backwards compatibility and tests + impl WeightInfo for () { + fn track_asset_price_feed() -> Weight { + Default::default() + } + + fn untrack_asset_price_feed() -> Weight { + Default::default() + } + } } diff --git a/pallets/price-feed/src/mock.rs b/pallets/price-feed/src/mock.rs index 4f3897940a..21d95bb04c 100644 --- a/pallets/price-feed/src/mock.rs +++ b/pallets/price-feed/src/mock.rs @@ -126,6 +126,7 @@ impl pallet_price_feed::Config for Test { type AssetId = AssetId; type Oracle = ChainlinkFeed; type Event = Event; + type WeightInfo = (); } #[derive(Debug, Clone, Default)] diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 84be35d8a0..238d2afac1 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -502,6 +502,7 @@ impl pallet_price_feed::Config for Runtime { type AssetId = AssetId; type Oracle = ChainlinkFeed; type Event = Event; + type WeightInfo = weights::pallet_price_feed::WeightInfo; } parameter_types! { diff --git a/runtime/src/weights/mod.rs b/runtime/src/weights/mod.rs index 517611d9fd..8dd13b84c6 100644 --- a/runtime/src/weights/mod.rs +++ b/runtime/src/weights/mod.rs @@ -2,4 +2,5 @@ // SPDX-License-Identifier: LGPL-3.0-only pub mod pallet_asset_index; pub mod pallet_local_treasury; +pub mod pallet_price_feed; pub mod pallet_remote_asset_manager; diff --git a/runtime/src/weights/pallet_price_feed.rs b/runtime/src/weights/pallet_price_feed.rs new file mode 100644 index 0000000000..51de2fac70 --- /dev/null +++ b/runtime/src/weights/pallet_price_feed.rs @@ -0,0 +1,42 @@ +// Copyright 2021 ChainSafe Systems +// SPDX-License-Identifier: LGPL-3.0-only + +//! Autogenerated weights for pallet_price_feed +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 +//! DATE: 2021-06-03, STEPS: `[]`, REPEAT: 1, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 128 + +// Executed Command: +// ./target/release/pint +// benchmark +// --execution +// wasm +// --wasm-execution +// compiled +// -p +// pallet_price_feed +// -e +// * +// --raw +// --output +// runtime/src/weights/pallet_price_feed.rs + +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Weight functions for pallet_price_feed. +pub struct WeightInfo(PhantomData); +impl pallet_price_feed::WeightInfo for WeightInfo { + fn track_asset_price_feed() -> Weight { + (18_000_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn untrack_asset_price_feed() -> Weight { + (15_000_000 as Weight).saturating_add(T::DbWeight::get().reads(1 as Weight)) + } +} From 1163ed77a518664eaa400aa1dc17dc4714568325 Mon Sep 17 00:00:00 2001 From: clearloop Date: Fri, 4 Jun 2021 02:06:00 +0800 Subject: [PATCH 20/32] feat(benchmark): add default weight to pallet saft registry --- pallets/saft-registry/src/benchmarking.rs | 31 +++++++++++++-------- pallets/saft-registry/src/lib.rs | 22 +++++++++++++++ pallets/saft-registry/src/mock.rs | 1 + runtime/src/lib.rs | 1 + runtime/src/weights/mod.rs | 1 + runtime/src/weights/pallet_saft_registry.rs | 24 ++++++++++------ 6 files changed, 59 insertions(+), 21 deletions(-) diff --git a/pallets/saft-registry/src/benchmarking.rs b/pallets/saft-registry/src/benchmarking.rs index f32c579a74..f9c14d7881 100644 --- a/pallets/saft-registry/src/benchmarking.rs +++ b/pallets/saft-registry/src/benchmarking.rs @@ -2,31 +2,38 @@ // SPDX-License-Identifier: LGPL-3.0-only use super::*; use frame_benchmarking::{benchmarks, whitelisted_caller}; +use frame_support::assert_ok; use frame_system::Origin; benchmarks! { add_saft { - let caller = whitelisted_caller(); - let asset_id: T::AssetId = 0.into(); }: _( - >::Signed(caller), - asset_id, + >::Root, + 0_u32.into(), 100_u32.into(), 20_u32.into() ) verify { } - remove_saft { - }: _( - >::Signed(whitelisted_caller()), - 0.into(), - 0 - ) verify { - } + // TODO: + // + // require `remote_asset` of pallet asset-index + // + // remove_saft { + // assert_ok!(>::add_saft(>::Root.into(), 0.into(), 100_u32.into(), 20_u32.into())); + // }: _( + // // >::Signed(whitelisted_caller()), + // >::Root, + // 0.into(), + // 0 + // ) verify { + // } report_nav { + assert_ok!(>::add_saft(>::Root.into(), 0.into(), 100_u32.into(), 20_u32.into())); }: _( - >::Signed(whitelisted_caller()), + // >::Signed(whitelisted_caller()), + >::Root, 0.into(), 0, 100_u32.into() diff --git a/pallets/saft-registry/src/lib.rs b/pallets/saft-registry/src/lib.rs index b4103f2acb..b750804ae8 100644 --- a/pallets/saft-registry/src/lib.rs +++ b/pallets/saft-registry/src/lib.rs @@ -32,6 +32,8 @@ pub mod pallet { type Balance: Parameter + AtLeast32BitUnsigned; type AssetId: Parameter + From; type Event: From> + IsType<::Event>; + /// The weight for this pallet's extrinsics. + type WeightInfo: WeightInfo; } #[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)] @@ -152,4 +154,24 @@ pub mod pallet { Ok(().into()) } } + + /// Trait for the asset-index pallet extrinsic weights. + pub trait WeightInfo { + fn add_saft() -> Weight; + // TODO: (incompleted) + // + // fn remove_saft() -> Weight; + fn report_nav() -> Weight; + } + + /// For backwards compatibility and tests + impl WeightInfo for () { + fn add_saft() -> Weight { + Default::default() + } + + fn report_nav() -> Weight { + Default::default() + } + } } diff --git a/pallets/saft-registry/src/mock.rs b/pallets/saft-registry/src/mock.rs index 499881bb09..34def6b3a7 100644 --- a/pallets/saft-registry/src/mock.rs +++ b/pallets/saft-registry/src/mock.rs @@ -88,6 +88,7 @@ impl pallet_saft_registry::Config for Test { type Balance = Balance; type AssetRecorder = MockAssetRecorder; type AssetId = u32; + type WeightInfo = (); } // Build genesis storage according to the mock runtime. diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 238d2afac1..c3d19b53a3 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -457,6 +457,7 @@ impl pallet_saft_registry::Config for Runtime { type Balance = Balance; type AssetRecorder = AssetIndex; type AssetId = AssetId; + type WeightInfo = weights::pallet_saft_registry::WeightInfo; } parameter_types! { diff --git a/runtime/src/weights/mod.rs b/runtime/src/weights/mod.rs index 8dd13b84c6..630123b789 100644 --- a/runtime/src/weights/mod.rs +++ b/runtime/src/weights/mod.rs @@ -4,3 +4,4 @@ pub mod pallet_asset_index; pub mod pallet_local_treasury; pub mod pallet_price_feed; pub mod pallet_remote_asset_manager; +pub mod pallet_saft_registry; diff --git a/runtime/src/weights/pallet_saft_registry.rs b/runtime/src/weights/pallet_saft_registry.rs index b5f7234495..0e1f4808ac 100644 --- a/runtime/src/weights/pallet_saft_registry.rs +++ b/runtime/src/weights/pallet_saft_registry.rs @@ -1,7 +1,5 @@ -// Copyright 2021 ChainSafe Systems -// SPDX-License-Identifier: LGPL-3.0-only -//! Autogenerated weights for pallet_remote_asset_manager +//! Autogenerated weights for pallet_saft_registry //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 //! DATE: 2021-06-03, STEPS: `[]`, REPEAT: 1, LOW RANGE: `[]`, HIGH RANGE: `[]` @@ -15,23 +13,31 @@ // --wasm-execution // compiled // -p -// pallet_remote_asset_manager +// pallet_saft_registry // -e // * // --raw // --output // runtime/src/weights/pallet_saft_registry.rs + #![allow(unused_parens)] #![allow(unused_imports)] use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -/// Weight functions for pallet_remote_asset_manager. +/// Weight functions for pallet_saft_registry. pub struct WeightInfo(PhantomData); -impl pallet_remote_asset_manager::WeightInfo for WeightInfo { - fn transfer() -> Weight { - (2_000_000 as Weight) - } +impl pallet_saft_registry::WeightInfo for WeightInfo { + fn add_saft() -> Weight { + (23_000_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn report_nav() -> Weight { + (18_000_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } } From f744ee652478639eb1a4786a31134a7c31b0b6f0 Mon Sep 17 00:00:00 2001 From: clearloop Date: Fri, 4 Jun 2021 02:42:10 +0800 Subject: [PATCH 21/32] chore(weights): add license too the weight config of pallet_saft_registry in runtime --- runtime/src/weights/pallet_saft_registry.rs | 23 +++++++++++---------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/runtime/src/weights/pallet_saft_registry.rs b/runtime/src/weights/pallet_saft_registry.rs index 0e1f4808ac..1ff8ebe864 100644 --- a/runtime/src/weights/pallet_saft_registry.rs +++ b/runtime/src/weights/pallet_saft_registry.rs @@ -1,3 +1,5 @@ +// Copyright 2021 ChainSafe Systems +// SPDX-License-Identifier: LGPL-3.0-only //! Autogenerated weights for pallet_saft_registry //! @@ -20,7 +22,6 @@ // --output // runtime/src/weights/pallet_saft_registry.rs - #![allow(unused_parens)] #![allow(unused_imports)] @@ -30,14 +31,14 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_saft_registry. pub struct WeightInfo(PhantomData); impl pallet_saft_registry::WeightInfo for WeightInfo { - fn add_saft() -> Weight { - (23_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn report_nav() -> Weight { - (18_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } + fn add_saft() -> Weight { + (23_000_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn report_nav() -> Weight { + (18_000_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } } From d37472671adb148d91030687aa101429fdbe52e6 Mon Sep 17 00:00:00 2001 From: clearloop Date: Fri, 4 Jun 2021 12:34:23 +0800 Subject: [PATCH 22/32] feat(benchmark): add default weight to pallet committee --- pallets/committee/src/benchmarking.rs | 72 +++++++++++++++-------- pallets/committee/src/lib.rs | 11 +++- pallets/committee/src/mock.rs | 2 +- pallets/price-feed/src/benchmarking.rs | 2 +- pallets/saft-registry/src/benchmarking.rs | 2 +- runtime/src/lib.rs | 14 ++--- runtime/src/weights/mod.rs | 1 + runtime/src/weights/pallet_committee.rs | 53 +++++++++++++++++ 8 files changed, 121 insertions(+), 36 deletions(-) create mode 100644 runtime/src/weights/pallet_committee.rs diff --git a/pallets/committee/src/benchmarking.rs b/pallets/committee/src/benchmarking.rs index 1ace3e2718..e2a49a8185 100644 --- a/pallets/committee/src/benchmarking.rs +++ b/pallets/committee/src/benchmarking.rs @@ -1,15 +1,15 @@ // Copyright 2021 ChainSafe Systems // SPDX-License-Identifier: LGPL-3.0-only use super::*; -use frame_benchmarking::{benchmarks, vec, whitelisted_caller, Box}; -use frame_support::assert_ok; -use frame_system::{Call as SystemCall, RawOrigin as SystemOrigin}; +use frame_benchmarking::{account, benchmarks, vec, whitelisted_caller, Box}; +use frame_support::{assert_ok, traits::Get}; +use frame_system::{Call as SystemCall, Pallet as System, RawOrigin as SystemOrigin}; -fn submit_proposal() -> pallet::Proposal { +fn submit_proposal(caller: T::AccountId) -> pallet::Proposal { let action: T::Action = >::remark(vec![0; 0]).into(); let expected_nonce = pallet::ProposalCount::::get(); assert_ok!(>::propose( - SystemOrigin::Root.into(), + SystemOrigin::Signed(caller).into(), Box::new(action.clone()) )); pallet::Proposal::::new(expected_nonce, action) @@ -19,20 +19,23 @@ benchmarks! { propose { let caller: T::AccountId = whitelisted_caller(); }: _( - SystemOrigin::Root, + SystemOrigin::Signed(caller), Box::new(>::remark(vec![0; 0]).into()) ) verify { // TODO: // // verify last event - } vote { let caller: T::AccountId = whitelisted_caller(); - let proposal = submit_proposal::(); + let proposal = submit_proposal::(caller.clone()); + assert_ok!(>::add_constituent(SystemOrigin::Root.into(), caller.clone())); + + // run to voting period + >::set_block_number(>::block_number() + ::VotingPeriod::get() + ::ProposalSubmissionPeriod::get() + 1_u32.into()); }: _( - SystemOrigin::Root, + SystemOrigin::Signed(caller), proposal.hash(), Vote::Abstain ) verify { @@ -43,25 +46,48 @@ benchmarks! { close { let caller: T::AccountId = whitelisted_caller(); + let proposal: pallet::Proposal = submit_proposal::(caller.clone()); + assert_ok!(>::add_constituent(SystemOrigin::Root.into(), caller.clone())); + let voters = ["a", "b", "c", "d", "e"]; + + // run to voting period + >::set_block_number(>::block_number() + ::VotingPeriod::get() + ::ProposalSubmissionPeriod::get() + 1_u32.into()); + + // generate members + for i in &voters { + let voter: T::AccountId = account(i, 0, 0); + >::insert(voter.clone(), MemberType::Council); + + // vote aye + assert_ok!(>::vote( + SystemOrigin::Signed(voter).into(), + proposal.hash(), + Vote::Aye, + )); + } + + // run out of voting period + >::set_block_number( + >::block_number() + + ::VotingPeriod::get() * 2_u32.into() + + ::ProposalSubmissionPeriod::get() + + 1_u32.into() + ); }: _( - SystemOrigin::Root, - submit_proposal::().hash() + SystemOrigin::Signed(caller), + proposal.hash() ) verify { // TODO: // // verify last event } - // TODO: - // - // This is hard to benchmark limited by the `Call` in environment. - // - // Use the weight of `propose` currently - // - // - // add_constituent { - // - // }: _() verify { - // - // } + add_constituent { + let constituent: T::AccountId = account("constituent", 0, 0); + }: _( + SystemOrigin::Root, + constituent.clone() + ) verify { + assert!(>::contains_key(constituent)); + } } diff --git a/pallets/committee/src/lib.rs b/pallets/committee/src/lib.rs index db3cab659f..c96e062738 100644 --- a/pallets/committee/src/lib.rs +++ b/pallets/committee/src/lib.rs @@ -86,8 +86,8 @@ pub mod pallet { type Event: From> + IsType<::Event>; - // /// The weight for this pallet's extrinsics. - // type WeightInfo: WeightInfo; + /// The weight for this pallet's extrinsics. + type WeightInfo: WeightInfo; } pub type Origin = CommitteeOrigin, BlockNumberFor>; @@ -390,7 +390,7 @@ pub mod pallet { origin: OriginFor, proposal_hash: HashFor, ) -> DispatchResultWithPostInfo { - let closer = ensure_signed(origin.clone())?; + let closer = Self::ensure_member(origin.clone())?.account_id; T::ProposalExecutionOrigin::ensure_origin(origin)?; // ensure proposal has not already been executed @@ -469,6 +469,7 @@ pub mod pallet { fn propose() -> Weight; fn vote() -> Weight; fn close() -> Weight; + fn add_constituent() -> Weight; } /// For backwards compatibility and tests @@ -484,5 +485,9 @@ pub mod pallet { fn close() -> Weight { Default::default() } + + fn add_constituent() -> Weight { + Default::default() + } } } diff --git a/pallets/committee/src/mock.rs b/pallets/committee/src/mock.rs index 576b35cd1b..31cf4ec143 100644 --- a/pallets/committee/src/mock.rs +++ b/pallets/committee/src/mock.rs @@ -102,7 +102,7 @@ impl pallet_committee::Config for Test { type Origin = Origin; type Action = Call; type Event = Event; - // type WeightInfo = (); + type WeightInfo = (); } pub fn run_to_block(n: u64) { diff --git a/pallets/price-feed/src/benchmarking.rs b/pallets/price-feed/src/benchmarking.rs index 20b1058b55..9df79f264f 100644 --- a/pallets/price-feed/src/benchmarking.rs +++ b/pallets/price-feed/src/benchmarking.rs @@ -1,7 +1,7 @@ // Copyright 2021 ChainSafe Systems // SPDX-License-Identifier: LGPL-3.0-only use super::*; -use frame_benchmarking::{benchmarks, whitelisted_caller, Zero}; +use frame_benchmarking::{benchmarks, Zero}; use frame_support::traits::Get; use frame_system::Origin; diff --git a/pallets/saft-registry/src/benchmarking.rs b/pallets/saft-registry/src/benchmarking.rs index f9c14d7881..f1d9f8ee32 100644 --- a/pallets/saft-registry/src/benchmarking.rs +++ b/pallets/saft-registry/src/benchmarking.rs @@ -1,7 +1,7 @@ // Copyright 2021 ChainSafe Systems // SPDX-License-Identifier: LGPL-3.0-only use super::*; -use frame_benchmarking::{benchmarks, whitelisted_caller}; +use frame_benchmarking::benchmarks; use frame_support::assert_ok; use frame_system::Origin; diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index c3d19b53a3..82bf21ceb1 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -442,8 +442,8 @@ parameter_types! { } impl pallet_local_treasury::Config for Runtime { - // Using signed as the admin origin for now - type AdminOrigin = frame_system::EnsureSigned; + // Using root as the admin origin for now + type AdminOrigin = frame_system::EnsureRoot; type PalletId = TreasuryPalletId; type Currency = Balances; type Event = Event; @@ -479,15 +479,15 @@ impl pallet_committee::Config for Runtime { type ProposalSubmissionPeriod = ProposalSubmissionPeriod; type VotingPeriod = VotingPeriod; type MinCouncilVotes = MinCouncilVotes; - // Using root as the admin origin for now - type ProposalSubmissionOrigin = frame_system::EnsureRoot; - type ProposalExecutionOrigin = frame_system::EnsureRoot; + // Using signed as the admin origin for now + type ProposalSubmissionOrigin = frame_system::EnsureSigned; + type ProposalExecutionOrigin = frame_system::EnsureSigned; type ApprovedByCommitteeOrigin = EnsureApprovedByCommittee; type ProposalNonce = u32; type Origin = Origin; type Action = Call; type Event = Event; - // type WeightInfo = + type WeightInfo = weights::pallet_committee::WeightInfo; } impl pallet_asset_depository::Config for Runtime { @@ -544,7 +544,7 @@ parameter_types! { impl pallet_asset_index::Config for Runtime { // Using signed as the admin origin for testing now - type AdminOrigin = frame_system::EnsureSigned; + type AdminOrigin = frame_system::EnsureRoot; type Event = Event; type AssetId = AssetId; type IndexToken = Balances; diff --git a/runtime/src/weights/mod.rs b/runtime/src/weights/mod.rs index 630123b789..198da963a5 100644 --- a/runtime/src/weights/mod.rs +++ b/runtime/src/weights/mod.rs @@ -1,6 +1,7 @@ // Copyright 2021 ChainSafe Systems // SPDX-License-Identifier: LGPL-3.0-only pub mod pallet_asset_index; +pub mod pallet_committee; pub mod pallet_local_treasury; pub mod pallet_price_feed; pub mod pallet_remote_asset_manager; diff --git a/runtime/src/weights/pallet_committee.rs b/runtime/src/weights/pallet_committee.rs new file mode 100644 index 0000000000..cf0ab3fd88 --- /dev/null +++ b/runtime/src/weights/pallet_committee.rs @@ -0,0 +1,53 @@ + +//! Autogenerated weights for pallet_committee +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 +//! DATE: 2021-06-04, STEPS: `[]`, REPEAT: 1, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 128 + +// Executed Command: +// ./target/release/pint +// benchmark +// --execution +// wasm +// --wasm-execution +// compiled +// -p +// pallet_committee +// -e +// * +// --raw +// --output +// runtime/src/weights/pallet_committee.rs + + +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Weight functions for pallet_committee. +pub struct WeightInfo(PhantomData); +impl pallet_committee::WeightInfo for WeightInfo { + fn propose() -> Weight { + (30_000_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(4 as Weight)) + } + fn vote() -> Weight { + (28_000_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn close() -> Weight { + (42_000_000 as Weight) + .saturating_add(T::DbWeight::get().reads(4 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn add_constituent() -> Weight { + (16_000_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } +} From 4dfe944cc6034cef8356a3b8ad67aab6ba22be52 Mon Sep 17 00:00:00 2001 From: clearloop Date: Fri, 4 Jun 2021 19:17:38 +0800 Subject: [PATCH 23/32] feat(price-feed): configure Chainsafe/chainlink-polkadot to price-feed --- Cargo.lock | 2226 +++++++++-------------- pallets/asset-index/Cargo.toml | 7 + pallets/asset-index/src/benchmarking.rs | 29 +- pallets/committee/src/lib.rs | 2 +- pallets/price-feed/Cargo.toml | 9 +- pallets/price-feed/src/mock.rs | 8 +- runtime/Cargo.toml | 3 +- runtime/src/lib.rs | 11 +- 8 files changed, 919 insertions(+), 1376 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 84c85eaf20..2ad3dc0da0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -487,13 +487,13 @@ dependencies = [ "sc-keystore", "sc-network", "sc-network-gossip", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-application-crypto", "sp-blockchain", "sp-consensus", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-keystore", + "sp-runtime", "sp-utils", "substrate-prometheus-endpoint", "thiserror", @@ -516,8 +516,8 @@ dependencies = [ "sc-rpc", "serde", "serde_json", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-runtime", ] [[package]] @@ -526,11 +526,11 @@ version = "0.1.0" source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=rococo-v1#b0e5f2da52cc9bc9804a23e111d003413b268faf" dependencies = [ "parity-scale-codec", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -1275,10 +1275,10 @@ dependencies = [ "polkadot-primitives", "sc-client-api", "sp-consensus", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-state-machine", "tracing", ] @@ -1294,14 +1294,14 @@ dependencies = [ "polkadot-primitives", "polkadot-runtime", "sc-client-api", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-trie", "substrate-prometheus-endpoint", "tokio 0.1.22", "tracing", @@ -1321,13 +1321,13 @@ dependencies = [ "parking_lot 0.9.0", "polkadot-service", "sc-client-api", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-inherents", + "sp-runtime", "substrate-prometheus-endpoint", "tracing", ] @@ -1348,11 +1348,11 @@ dependencies = [ "polkadot-service", "polkadot-statement-table", "sc-client-api", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-runtime", "tracing", ] @@ -1373,11 +1373,11 @@ dependencies = [ "sc-service", "sc-telemetry", "sc-tracing", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-runtime", "tracing", ] @@ -1389,8 +1389,8 @@ dependencies = [ "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "environmental", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "hash-db", "log", "memory-db", @@ -1398,15 +1398,15 @@ dependencies = [ "parity-scale-codec", "polkadot-parachain", "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-externalities", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", + "sp-version", "trie-db", "xcm", ] @@ -1417,12 +1417,12 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus.git?branch=rococo-v1#da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" dependencies = [ "cumulus-primitives-core", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "parity-scale-codec", "serde", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-std", "xcm", ] @@ -1432,14 +1432,14 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus.git?branch=rococo-v1#da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" dependencies = [ "cumulus-primitives-core", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "rand 0.8.3", "rand_chacha 0.3.0", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-std", "xcm", "xcm-executor", ] @@ -1449,15 +1449,15 @@ name = "cumulus-primitives-core" version = "0.1.0" source = "git+https://github.com/paritytech/cumulus.git?branch=rococo-v1#da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", "impl-trait-for-tuples", "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-std", + "sp-trie", "xcm", ] @@ -1469,13 +1469,13 @@ dependencies = [ "cumulus-primitives-core", "parity-scale-codec", "sc-client-api", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", "tracing", ] @@ -1485,15 +1485,15 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus.git?branch=rococo-v1#da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" dependencies = [ "cumulus-primitives-core", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", "impl-trait-for-tuples", "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-std", + "sp-trie", "xcm", ] @@ -1995,37 +1995,18 @@ name = "frame-benchmarking" version = "3.1.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "linregress", "log", "parity-scale-codec", "paste", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", -] - -[[package]] -name = "frame-benchmarking" -version = "3.1.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "linregress", - "log", - "parity-scale-codec", - "paste", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-runtime-interface 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-api", + "sp-io", + "sp-runtime", + "sp-runtime-interface", + "sp-std", + "sp-storage", ] [[package]] @@ -2035,7 +2016,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8f dependencies = [ "Inflector", "chrono", - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", "handlebars", "parity-scale-codec", "sc-cli", @@ -2043,11 +2024,11 @@ dependencies = [ "sc-executor", "sc-service", "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-externalities", + "sp-keystore", + "sp-runtime", + "sp-state-machine", "structopt", ] @@ -2056,12 +2037,12 @@ name = "frame-election-provider-support" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "parity-scale-codec", - "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-arithmetic", "sp-npos-elections", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-std", ] [[package]] @@ -2069,14 +2050,14 @@ name = "frame-executive" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-tracing 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-tracing", ] [[package]] @@ -2086,19 +2067,8 @@ source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8f dependencies = [ "parity-scale-codec", "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", -] - -[[package]] -name = "frame-metadata" -version = "13.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "parity-scale-codec", - "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-core", + "sp-std", ] [[package]] @@ -2107,8 +2077,8 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "bitflags", - "frame-metadata 13.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support-procedural 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-metadata", + "frame-support-procedural", "impl-trait-for-tuples", "log", "once_cell", @@ -2116,41 +2086,15 @@ dependencies = [ "paste", "serde", "smallvec 1.6.1", - "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-staking 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-tracing 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", -] - -[[package]] -name = "frame-support" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "bitflags", - "frame-metadata 13.0.0 (git+https://github.com/paritytech/substrate.git)", - "frame-support-procedural 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "impl-trait-for-tuples", - "log", - "once_cell", - "parity-scale-codec", - "paste", - "serde", - "smallvec 1.6.1", - "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-staking 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-tracing 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-arithmetic", + "sp-core", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-state-machine", + "sp-std", + "sp-tracing", ] [[package]] @@ -2159,19 +2103,7 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "Inflector", - "frame-support-procedural-tools 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "proc-macro2 1.0.26", - "quote 1.0.9", - "syn 1.0.72", -] - -[[package]] -name = "frame-support-procedural" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "Inflector", - "frame-support-procedural-tools 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "frame-support-procedural-tools", "proc-macro2 1.0.26", "quote 1.0.9", "syn 1.0.72", @@ -2182,19 +2114,7 @@ name = "frame-support-procedural-tools" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "proc-macro-crate 1.0.0", - "proc-macro2 1.0.26", - "quote 1.0.9", - "syn 1.0.72", -] - -[[package]] -name = "frame-support-procedural-tools" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "frame-support-procedural-tools-derive", "proc-macro-crate 1.0.0", "proc-macro2 1.0.26", "quote 1.0.9", @@ -2211,48 +2131,21 @@ dependencies = [ "syn 1.0.72", ] -[[package]] -name = "frame-support-procedural-tools-derive" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "proc-macro2 1.0.26", - "quote 1.0.9", - "syn 1.0.72", -] - [[package]] name = "frame-system" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", -] - -[[package]] -name = "frame-system" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "frame-support", "impl-trait-for-tuples", "log", "parity-scale-codec", "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-version", ] [[package]] @@ -2260,13 +2153,13 @@ name = "frame-system-benchmarking" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -2275,7 +2168,7 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "parity-scale-codec", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", ] [[package]] @@ -2283,11 +2176,11 @@ name = "frame-try-runtime" version = "0.9.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", "parity-scale-codec", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-runtime", + "sp-std", ] [[package]] @@ -3364,10 +3257,10 @@ source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf dependencies = [ "beefy-primitives", "bitvec", - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", "frame-executive", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -3415,21 +3308,21 @@ dependencies = [ "serde", "serde_derive", "smallvec 1.6.1", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-inherents", + "sp-io", "sp-npos-elections", "sp-offchain", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", "sp-session", - "sp-staking 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-staking", + "sp-std", "sp-transaction-pool", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-version", "static_assertions", "substrate-wasm-builder 3.0.0", ] @@ -4626,33 +4519,34 @@ dependencies = [ name = "pallet-asset-depository" version = "0.0.1" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-io", + "sp-runtime", ] [[package]] name = "pallet-asset-index" version = "0.0.1" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "pallet-asset-depository", "pallet-balances", + "pallet-chainlink-feed", "pallet-price-feed", "pallet-remote-asset-manager", "parity-scale-codec", "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "xcm", "xcm-executor", ] @@ -4662,14 +4556,14 @@ name = "pallet-authority-discovery" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "pallet-session", "parity-scale-codec", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-application-crypto", "sp-authority-discovery", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-std", ] [[package]] @@ -4677,14 +4571,14 @@ name = "pallet-authorship" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "parity-scale-codec", "sp-authorship", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-inherents", + "sp-runtime", + "sp-std", ] [[package]] @@ -4692,22 +4586,22 @@ name = "pallet-babe" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "pallet-authorship", "pallet-session", "pallet-timestamp", "parity-scale-codec", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-application-crypto", "sp-consensus-babe", "sp-consensus-vrf", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-io", + "sp-runtime", "sp-session", - "sp-staking 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-staking", + "sp-std", ] [[package]] @@ -4715,13 +4609,13 @@ name = "pallet-balances" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-std", ] [[package]] @@ -4730,13 +4624,13 @@ version = "0.1.0" source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=rococo-v1#b0e5f2da52cc9bc9804a23e111d003413b268faf" dependencies = [ "beefy-primitives", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "pallet-session", "parity-scale-codec", "serde", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-std", ] [[package]] @@ -4744,29 +4638,29 @@ name = "pallet-bounties" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "pallet-treasury", "parity-scale-codec", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-chainlink-feed" version = "0.1.0" -source = "git+https://github.com/mattsse/chainlink-polkadot?branch=substrate-v3#0778ccf3ec2ef02de8e378c80f7eeb28fbb16805" +source = "git+https://github.com/ChainSafe/chainlink-polkadot#ee618d840cba167d5e77643511b2a4265951e8f1" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "serde", - "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-arithmetic", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -4774,30 +4668,30 @@ name = "pallet-collective" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-committee" version = "0.0.1" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "pallet-balances", "parity-scale-codec", "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-io", + "sp-runtime", ] [[package]] @@ -4805,14 +4699,14 @@ name = "pallet-democracy" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "serde", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -4820,18 +4714,18 @@ name = "pallet-election-provider-multi-phase" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", "frame-election-provider-support", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "rand 0.7.3", - "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-arithmetic", + "sp-io", "sp-npos-elections", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-std", "static_assertions", ] @@ -4840,16 +4734,16 @@ name = "pallet-elections-phragmen" version = "4.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-io", "sp-npos-elections", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-std", ] [[package]] @@ -4857,20 +4751,20 @@ name = "pallet-grandpa" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "pallet-authorship", "pallet-session", "parity-scale-codec", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-application-crypto", + "sp-core", "sp-finality-grandpa", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", "sp-session", - "sp-staking 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-staking", + "sp-std", ] [[package]] @@ -4879,13 +4773,13 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "enumflags2", - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -4893,18 +4787,18 @@ name = "pallet-im-online" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "pallet-authorship", "parity-scale-codec", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-staking 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -4912,30 +4806,30 @@ name = "pallet-indices" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-io", "sp-keyring", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-local-treasury" version = "0.0.1" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "pallet-balances", "parity-scale-codec", "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-io", + "sp-runtime", ] [[package]] @@ -4943,14 +4837,14 @@ name = "pallet-membership" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -4959,15 +4853,15 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "ckb-merkle-mountain-range", - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "pallet-mmr-primitives", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -4975,15 +4869,15 @@ name = "pallet-mmr-primitives" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "serde", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -4997,11 +4891,11 @@ dependencies = [ "pallet-mmr-primitives", "parity-scale-codec", "serde", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-blockchain", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", "sp-rpc", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", ] [[package]] @@ -5009,14 +4903,14 @@ name = "pallet-multisig" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5024,12 +4918,12 @@ name = "pallet-nicks" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "parity-scale-codec", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5037,15 +4931,15 @@ name = "pallet-offences" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "log", "pallet-balances", "parity-scale-codec", "serde", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-staking 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -5053,10 +4947,10 @@ name = "pallet-offences-benchmarking" version = "3.0.0" source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", "frame-election-provider-support", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "pallet-babe", "pallet-balances", "pallet-grandpa", @@ -5065,25 +4959,25 @@ dependencies = [ "pallet-session", "pallet-staking", "parity-scale-codec", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-staking 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] name = "pallet-price-feed" version = "0.0.1" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "pallet-balances", "pallet-chainlink-feed", "parity-scale-codec", "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-io", + "sp-runtime", ] [[package]] @@ -5091,14 +4985,14 @@ name = "pallet-proxy" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5106,12 +5000,12 @@ name = "pallet-randomness-collective-flip" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "parity-scale-codec", "safe-mix", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-std", ] [[package]] @@ -5120,27 +5014,27 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "enumflags2", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "parity-scale-codec", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-remote-asset-manager" version = "0.0.1" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "pallet-balances", "parity-scale-codec", "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-io", + "sp-runtime", "xcm", "xcm-builder", "xcm-executor", @@ -5150,16 +5044,16 @@ dependencies = [ name = "pallet-saft-registry" version = "0.0.1" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "pallet-asset-index", "pallet-balances", "parity-scale-codec", "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-io", + "sp-runtime", ] [[package]] @@ -5167,14 +5061,14 @@ name = "pallet-scheduler" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5182,18 +5076,18 @@ name = "pallet-session" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "pallet-timestamp", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-io", + "sp-runtime", "sp-session", - "sp-staking 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-staking", + "sp-std", + "sp-trie", ] [[package]] @@ -5201,15 +5095,15 @@ name = "pallet-session-benchmarking" version = "3.0.0" source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "pallet-session", "pallet-staking", "rand 0.7.3", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", "sp-session", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-std", ] [[package]] @@ -5217,12 +5111,12 @@ name = "pallet-society" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "parity-scale-codec", "rand_chacha 0.2.2", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-std", ] [[package]] @@ -5230,10 +5124,10 @@ name = "pallet-staking" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", "frame-election-provider-support", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "log", "pallet-authorship", "pallet-session", @@ -5241,11 +5135,11 @@ dependencies = [ "paste", "rand_chacha 0.2.2", "serde", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-staking 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-application-crypto", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", "static_assertions", ] @@ -5265,12 +5159,12 @@ name = "pallet-sudo" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "parity-scale-codec", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5278,16 +5172,16 @@ name = "pallet-timestamp" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-std", "sp-timestamp", ] @@ -5296,14 +5190,14 @@ name = "pallet-tips" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "pallet-treasury", "parity-scale-codec", "serde", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-std", ] [[package]] @@ -5311,15 +5205,15 @@ name = "pallet-transaction-payment" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "parity-scale-codec", "serde", "smallvec 1.6.1", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5332,11 +5226,11 @@ dependencies = [ "jsonrpc-derive", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-blockchain", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", "sp-rpc", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", ] [[package]] @@ -5346,8 +5240,8 @@ source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8f dependencies = [ "pallet-transaction-payment", "parity-scale-codec", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-runtime", ] [[package]] @@ -5355,15 +5249,15 @@ name = "pallet-treasury" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "impl-trait-for-tuples", "pallet-balances", "parity-scale-codec", "serde", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-std", ] [[package]] @@ -5371,14 +5265,14 @@ name = "pallet-utility" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -5387,12 +5281,12 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "enumflags2", - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-std", ] [[package]] @@ -5400,12 +5294,12 @@ name = "pallet-xcm" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "parity-scale-codec", "serde", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-std", "xcm", ] @@ -5413,15 +5307,15 @@ dependencies = [ name = "pallet-xcm-asset-support" version = "0.0.1" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "pallet-balances", "parity-scale-codec", "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-io", + "sp-runtime", "xcm", "xcm-builder", "xcm-executor", @@ -5433,8 +5327,8 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus.git?branch=rococo-v1#da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" dependencies = [ "cumulus-primitives-core", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "parity-scale-codec", "serde", ] @@ -5448,10 +5342,10 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", "cumulus-primitives-utility", - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", "frame-executive", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "hex-literal 0.3.1", @@ -5474,17 +5368,17 @@ dependencies = [ "parity-scale-codec", "polkadot-parachain", "serde", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-block-builder", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-inherents", + "sp-io", "sp-offchain", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", "sp-session", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-std", "sp-transaction-pool", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-version", "substrate-wasm-builder 4.0.0", "xcm", "xcm-builder", @@ -5890,7 +5784,7 @@ dependencies = [ "cumulus-client-service", "cumulus-primitives-core", "derive_more 0.15.0", - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", "frame-benchmarking-cli", "hex-literal 0.2.1", "jsonrpc-core", @@ -5917,16 +5811,16 @@ dependencies = [ "sc-tracing", "sc-transaction-pool", "serde", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-inherents", + "sp-runtime", "sp-timestamp", "sp-transaction-pool", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-trie", "structopt", "substrate-build-script-utils", "substrate-frame-rpc-system", @@ -5988,9 +5882,9 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "rand 0.8.3", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-application-crypto", + "sp-core", + "sp-keystore", "thiserror", "tracing", ] @@ -6026,8 +5920,8 @@ dependencies = [ "polkadot-service", "sc-cli", "sc-service", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-trie", "structopt", "substrate-build-script-utils", "thiserror", @@ -6047,9 +5941,9 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-keystore", + "sp-runtime", "thiserror", "tracing", ] @@ -6061,9 +5955,9 @@ source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf dependencies = [ "parity-scale-codec", "parity-util-mem", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -6075,8 +5969,8 @@ dependencies = [ "polkadot-node-primitives", "polkadot-primitives", "reed-solomon-novelpoly", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-trie", "thiserror", ] @@ -6090,8 +5984,8 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-application-crypto", + "sp-keystore", "tracing", ] @@ -6127,8 +6021,8 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-maybe-compressed-blob 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-maybe-compressed-blob", "thiserror", "tracing", ] @@ -6154,11 +6048,11 @@ dependencies = [ "sc-client-api", "sc-keystore", "schnorrkel", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-application-crypto", "sp-blockchain", "sp-consensus", "sp-consensus-slots", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", "tracing", ] @@ -6195,7 +6089,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-statement-table", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-keystore", "thiserror", "tracing", ] @@ -6209,7 +6103,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-keystore", "thiserror", "tracing", "wasm-timer", @@ -6225,7 +6119,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-keystore", "thiserror", "tracing", ] @@ -6244,7 +6138,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-parachain", "polkadot-primitives", - "sp-maybe-compressed-blob 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-maybe-compressed-blob", "tracing", ] @@ -6275,12 +6169,12 @@ dependencies = [ "sc-block-builder", "sc-client-api", "sc-telemetry", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-inherents", + "sp-runtime", "sp-transaction-pool", "substrate-prometheus-endpoint", "tracing", @@ -6322,10 +6216,10 @@ dependencies = [ "sc-executor-common", "sc-executor-wasmtime", "slotmap", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-wasm-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-externalities", + "sp-io", + "sp-wasm-interface", "tracing", ] @@ -6340,10 +6234,10 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-authority-discovery", "sp-consensus-babe", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", "tracing", ] @@ -6361,7 +6255,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-primitives", "sc-network", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", "thiserror", ] @@ -6392,12 +6286,12 @@ dependencies = [ "polkadot-statement-table", "schnorrkel", "serde", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-application-crypto", "sp-consensus-babe", "sp-consensus-vrf", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-maybe-compressed-blob 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-maybe-compressed-blob", + "sp-runtime", "thiserror", "zstd", ] @@ -6426,7 +6320,7 @@ dependencies = [ "polkadot-statement-table", "sc-network", "smallvec 1.6.1", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", "substrate-prometheus-endpoint", "thiserror", "tracing", @@ -6451,9 +6345,9 @@ dependencies = [ "polkadot-primitives", "rand 0.8.3", "sc-network", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-application-crypto", + "sp-core", + "sp-keystore", "streamunordered", "substrate-prometheus-endpoint", "thiserror", @@ -6473,7 +6367,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "sc-client-api", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "tracing", ] @@ -6487,9 +6381,9 @@ dependencies = [ "parity-util-mem", "polkadot-core-primitives", "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -6498,26 +6392,26 @@ version = "0.8.30" source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" dependencies = [ "bitvec", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-system", "hex-literal 0.3.1", "parity-scale-codec", "parity-util-mem", "polkadot-core-primitives", "polkadot-parachain", "serde", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-application-crypto", + "sp-arithmetic", "sp-authority-discovery", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-staking 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keystore", + "sp-runtime", + "sp-staking", + "sp-std", + "sp-trie", + "sp-version", "thiserror", ] @@ -6554,13 +6448,13 @@ dependencies = [ "sc-keystore", "sc-rpc", "sc-sync-state-rpc", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-keystore", + "sp-runtime", "sp-transaction-pool", "substrate-frame-rpc-system", ] @@ -6572,10 +6466,10 @@ source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf dependencies = [ "beefy-primitives", "bitvec", - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", "frame-executive", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -6621,21 +6515,21 @@ dependencies = [ "serde", "serde_derive", "smallvec 1.6.1", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-inherents", + "sp-io", "sp-npos-elections", "sp-offchain", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", "sp-session", - "sp-staking 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-staking", + "sp-std", "sp-transaction-pool", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-version", "static_assertions", "substrate-wasm-builder 3.0.0", ] @@ -6647,9 +6541,9 @@ source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf dependencies = [ "beefy-primitives", "bitvec", - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "impl-trait-for-tuples", "libsecp256k1", "log", @@ -6672,14 +6566,14 @@ dependencies = [ "serde", "serde_derive", "slot-range-helper", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-core", + "sp-inherents", + "sp-io", + "sp-runtime", "sp-session", - "sp-staking 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-staking", + "sp-std", "static_assertions", "xcm", ] @@ -6691,9 +6585,9 @@ source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf dependencies = [ "bitvec", "derive_more 0.99.13", - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-support", + "frame-system", "libsecp256k1", "log", "pallet-authority-discovery", @@ -6710,15 +6604,15 @@ dependencies = [ "rand_chacha 0.3.0", "rustc-hex", "serde", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keystore", + "sp-runtime", "sp-session", - "sp-staking 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-staking", + "sp-std", "xcm", "xcm-executor", ] @@ -6730,7 +6624,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf dependencies = [ "beefy-gadget", "beefy-primitives", - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", "frame-system-rpc-runtime-api", "futures 0.3.15", "hex-literal 0.3.1", @@ -6788,24 +6682,24 @@ dependencies = [ "sc-telemetry", "sc-transaction-pool", "serde", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-authority-discovery", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", "sp-finality-grandpa", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-inherents", + "sp-io", + "sp-keystore", "sp-offchain", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", "sp-session", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-state-machine", + "sp-storage", "sp-transaction-pool", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-trie", "substrate-prometheus-endpoint", "thiserror", "tracing", @@ -6827,7 +6721,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "sc-network", - "sp-staking 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-staking", "tracing", ] @@ -6838,7 +6732,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf dependencies = [ "parity-scale-codec", "polkadot-primitives", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", ] [[package]] @@ -6850,8 +6744,8 @@ dependencies = [ "bitvec", "frame-election-provider-support", "frame-executive", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "frame-system-rpc-runtime-api", "log", "pallet-authority-discovery", @@ -6881,20 +6775,20 @@ dependencies = [ "serde", "serde_derive", "smallvec 1.6.1", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-inherents", + "sp-io", "sp-offchain", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", "sp-session", - "sp-staking 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-staking", + "sp-std", "sp-transaction-pool", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-version", "substrate-wasm-builder 3.0.0", ] @@ -6903,8 +6797,8 @@ name = "polkadot-test-service" version = "0.8.30" source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", + "frame-system", "futures 0.1.31", "futures 0.3.15", "hex", @@ -6934,17 +6828,17 @@ dependencies = [ "sc-service", "sc-tracing", "sc-transaction-pool", - "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-arithmetic", "sp-authority-discovery", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", "sp-finality-grandpa", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-inherents", "sp-keyring", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-state-machine", "substrate-test-client", "tempfile", "tracing", @@ -7506,9 +7400,9 @@ dependencies = [ "jsonrpsee-proc-macros", "log", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-io", + "sp-runtime", ] [[package]] @@ -7578,8 +7472,8 @@ source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf dependencies = [ "beefy-primitives", "frame-executive", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "frame-system-rpc-runtime-api", "hex-literal 0.3.1", "log", @@ -7614,20 +7508,20 @@ dependencies = [ "serde", "serde_derive", "smallvec 1.6.1", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-inherents", + "sp-io", "sp-offchain", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", "sp-session", - "sp-staking 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-staking", + "sp-std", "sp-transaction-pool", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-version", "substrate-wasm-builder 3.0.0", "xcm", "xcm-builder", @@ -7783,12 +7677,12 @@ dependencies = [ "sc-client-api", "sc-network", "serde_json", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-authority-discovery", "sp-blockchain", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-keystore", + "sp-runtime", "substrate-prometheus-endpoint", ] @@ -7805,12 +7699,12 @@ dependencies = [ "sc-client-api", "sc-proposer-metrics", "sc-telemetry", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-inherents", + "sp-runtime", "sp-transaction-pool", "substrate-prometheus-endpoint", ] @@ -7822,13 +7716,13 @@ source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8f dependencies = [ "parity-scale-codec", "sc-client-api", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", ] [[package]] @@ -7848,8 +7742,8 @@ dependencies = [ "serde_json", "sp-chain-spec", "sp-consensus-babe", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-runtime", ] [[package]] @@ -7888,13 +7782,13 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", "sp-keyring", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-panic-handler 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-keystore", + "sp-panic-handler", + "sp-runtime", "sp-utils", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-version", "structopt", "thiserror", "tiny-bip39", @@ -7916,22 +7810,22 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.11.1", "sc-executor", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", "sp-database", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-externalities", + "sp-inherents", + "sp-keystore", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-storage", "sp-transaction-pool", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-trie", "sp-utils", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-version", "substrate-prometheus-endpoint", ] @@ -7954,14 +7848,14 @@ dependencies = [ "sc-client-api", "sc-executor", "sc-state-db", - "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-arithmetic", "sp-blockchain", "sp-consensus", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", "sp-database", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-state-machine", + "sp-trie", "substrate-prometheus-endpoint", ] @@ -7974,7 +7868,7 @@ dependencies = [ "sc-client-api", "sp-blockchain", "sp-consensus", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", ] [[package]] @@ -8005,22 +7899,22 @@ dependencies = [ "sc-telemetry", "schnorrkel", "serde", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keystore", + "sp-runtime", "sp-timestamp", "sp-utils", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-version", "substrate-prometheus-endpoint", ] @@ -8038,14 +7932,14 @@ dependencies = [ "sc-consensus-epochs", "sc-rpc-api", "serde", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-application-crypto", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-keystore", + "sp-runtime", ] [[package]] @@ -8058,7 +7952,7 @@ dependencies = [ "sc-client-api", "sc-consensus", "sp-blockchain", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", ] [[package]] @@ -8073,18 +7967,18 @@ dependencies = [ "parity-scale-codec", "sc-client-api", "sc-telemetry", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-application-crypto", + "sp-arithmetic", "sp-blockchain", "sp-consensus", "sp-consensus-slots", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", "sp-timestamp", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-trie", "thiserror", ] @@ -8097,9 +7991,9 @@ dependencies = [ "sc-client-api", "sp-authorship", "sp-consensus", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-inherents", + "sp-runtime", ] [[package]] @@ -8117,18 +8011,18 @@ dependencies = [ "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-maybe-compressed-blob 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-panic-handler 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-core", + "sp-externalities", + "sp-io", + "sp-maybe-compressed-blob", + "sp-panic-handler", + "sp-runtime-interface", "sp-serializer", "sp-tasks", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-wasm-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-trie", + "sp-version", + "sp-wasm-interface", "wasmi", ] @@ -8142,9 +8036,9 @@ dependencies = [ "parity-wasm 0.41.0", "pwasm-utils", "sp-allocator", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", "sp-serializer", - "sp-wasm-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-wasm-interface", "thiserror", "wasmi", ] @@ -8158,9 +8052,9 @@ dependencies = [ "parity-scale-codec", "sc-executor-common", "sp-allocator", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-wasm-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-runtime-interface", + "sp-wasm-interface", "wasmi", ] @@ -8176,9 +8070,9 @@ dependencies = [ "sc-executor-common", "scoped-tls", "sp-allocator", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-wasm-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-runtime-interface", + "sp-wasm-interface", "wasmtime", ] @@ -8208,16 +8102,16 @@ dependencies = [ "sc-network-gossip", "sc-telemetry", "serde_json", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-application-crypto", + "sp-arithmetic", "sp-blockchain", "sp-consensus", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", "sp-finality-grandpa", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-inherents", + "sp-keystore", + "sp-runtime", "sp-utils", "substrate-prometheus-endpoint", ] @@ -8242,8 +8136,8 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-runtime", ] [[package]] @@ -8264,7 +8158,7 @@ dependencies = [ "sc-service", "sp-blockchain", "sp-finality-grandpa", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", ] [[package]] @@ -8279,7 +8173,7 @@ dependencies = [ "sc-client-api", "sc-network", "sp-blockchain", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", "sp-transaction-pool", "sp-utils", "wasm-timer", @@ -8299,9 +8193,9 @@ dependencies = [ "parking_lot 0.11.1", "rand 0.7.3", "serde_json", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-application-crypto", + "sp-core", + "sp-keystore", "subtle 2.4.0", ] @@ -8316,12 +8210,12 @@ dependencies = [ "parking_lot 0.11.1", "sc-client-api", "sc-executor", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-blockchain", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-externalities", + "sp-runtime", + "sp-state-machine", ] [[package]] @@ -8363,11 +8257,11 @@ dependencies = [ "serde", "serde_json", "smallvec 1.6.1", - "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-arithmetic", "sp-blockchain", "sp-consensus", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-runtime", "sp-utils", "substrate-prometheus-endpoint", "thiserror", @@ -8388,7 +8282,7 @@ dependencies = [ "log", "lru", "sc-network", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", "substrate-prometheus-endpoint", "tracing", "wasm-timer", @@ -8414,10 +8308,10 @@ dependencies = [ "sc-client-api", "sc-keystore", "sc-network", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-core", "sp-offchain", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", "sp-utils", "threadpool", ] @@ -8463,19 +8357,19 @@ dependencies = [ "sc-rpc-api", "sc-tracing", "serde_json", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-blockchain", "sp-chain-spec", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-keystore", "sp-offchain", "sp-rpc", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", "sp-session", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-state-machine", "sp-transaction-pool", "sp-utils", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-version", ] [[package]] @@ -8495,11 +8389,11 @@ dependencies = [ "serde", "serde_json", "sp-chain-spec", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", "sp-rpc", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", "sp-transaction-pool", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-version", ] [[package]] @@ -8516,7 +8410,7 @@ dependencies = [ "log", "serde", "serde_json", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", "substrate-prometheus-endpoint", ] @@ -8558,24 +8452,24 @@ dependencies = [ "sc-transaction-pool", "serde", "serde_json", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-externalities", + "sp-inherents", + "sp-io", + "sp-keystore", + "sp-runtime", "sp-session", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-tracing 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-state-machine", + "sp-tracing", "sp-transaction-pool", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-trie", "sp-utils", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-version", "substrate-prometheus-endpoint", "tempfile", "thiserror", @@ -8595,7 +8489,7 @@ dependencies = [ "parity-util-mem-derive", "parking_lot 0.11.1", "sc-client-api", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", "thiserror", ] @@ -8615,7 +8509,7 @@ dependencies = [ "sc-rpc-api", "serde_json", "sp-blockchain", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", "thiserror", ] @@ -8656,7 +8550,7 @@ dependencies = [ "sc-tracing-proc-macro", "serde", "serde_json", - "sp-tracing 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-tracing", "thiserror", "tracing", "tracing-core", @@ -8691,8 +8585,8 @@ dependencies = [ "retain_mut", "serde", "sp-blockchain", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-runtime", "sp-transaction-pool", "sp-utils", "thiserror", @@ -8713,11 +8607,11 @@ dependencies = [ "parking_lot 0.11.1", "sc-client-api", "sc-transaction-graph", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-blockchain", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-tracing 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-runtime", + "sp-tracing", "sp-transaction-pool", "sp-utils", "substrate-prometheus-endpoint", @@ -9022,15 +8916,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" -[[package]] -name = "slog" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06" -dependencies = [ - "erased-serde", -] - [[package]] name = "slot-range-helper" version = "0.8.30" @@ -9039,8 +8924,8 @@ dependencies = [ "enumn", "parity-scale-codec", "paste", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-std", ] [[package]] @@ -9128,9 +9013,9 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "log", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-wasm-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-std", + "sp-wasm-interface", "thiserror", ] @@ -9142,29 +9027,12 @@ dependencies = [ "hash-db", "log", "parity-scale-codec", - "sp-api-proc-macro 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "thiserror", -] - -[[package]] -name = "sp-api" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", - "sp-api-proc-macro 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-api-proc-macro", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-version", "thiserror", ] @@ -9180,18 +9048,6 @@ dependencies = [ "syn 1.0.72", ] -[[package]] -name = "sp-api-proc-macro" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "blake2-rfc", - "proc-macro-crate 1.0.0", - "proc-macro2 1.0.26", - "quote 1.0.9", - "syn 1.0.72", -] - [[package]] name = "sp-application-crypto" version = "3.0.0" @@ -9199,21 +9055,9 @@ source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8f dependencies = [ "parity-scale-codec", "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", -] - -[[package]] -name = "sp-application-crypto" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "parity-scale-codec", - "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-core", + "sp-io", + "sp-std", ] [[package]] @@ -9225,22 +9069,8 @@ dependencies = [ "num-traits", "parity-scale-codec", "serde", - "sp-debug-derive 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "static_assertions", -] - -[[package]] -name = "sp-arithmetic" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "integer-sqrt", - "num-traits", - "parity-scale-codec", - "serde", - "sp-debug-derive 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-debug-derive", + "sp-std", "static_assertions", ] @@ -9250,10 +9080,10 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "parity-scale-codec", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-application-crypto", + "sp-runtime", + "sp-std", ] [[package]] @@ -9262,9 +9092,9 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "parity-scale-codec", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-inherents", + "sp-runtime", + "sp-std", ] [[package]] @@ -9273,10 +9103,10 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "parity-scale-codec", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-inherents", + "sp-runtime", + "sp-std", ] [[package]] @@ -9289,11 +9119,11 @@ dependencies = [ "lru", "parity-scale-codec", "parking_lot 0.11.1", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-consensus", "sp-database", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", + "sp-state-machine", "thiserror", ] @@ -9319,15 +9149,15 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.11.1", "serde", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", "sp-utils", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-version", "substrate-prometheus-endpoint", "thiserror", "wasm-timer", @@ -9341,16 +9171,16 @@ dependencies = [ "merlin", "parity-scale-codec", "serde", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-application-crypto", "sp-consensus", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-inherents", + "sp-keystore", + "sp-runtime", + "sp-std", "sp-timestamp", ] @@ -9360,8 +9190,8 @@ version = "0.9.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "parity-scale-codec", - "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-arithmetic", + "sp-runtime", ] [[package]] @@ -9371,9 +9201,9 @@ source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8f dependencies = [ "parity-scale-codec", "schnorrkel", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -9406,55 +9236,11 @@ dependencies = [ "secrecy", "serde", "sha2 0.9.5", - "sp-debug-derive 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "substrate-bip39", - "thiserror", - "tiny-bip39", - "tiny-keccak", - "twox-hash", - "wasmi", - "zeroize", -] - -[[package]] -name = "sp-core" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "base58", - "blake2-rfc", - "byteorder", - "dyn-clonable", - "ed25519-dalek", - "futures 0.3.15", - "hash-db", - "hash256-std-hasher", - "hex", - "impl-serde", - "lazy_static", - "libsecp256k1", - "log", - "merlin", - "num-traits", - "parity-scale-codec", - "parity-util-mem", - "parking_lot 0.11.1", - "primitive-types", - "rand 0.7.3", - "regex", - "schnorrkel", - "secrecy", - "serde", - "sha2 0.9.5", - "sp-debug-derive 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git)", - "sp-runtime-interface 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-debug-derive", + "sp-externalities", + "sp-runtime-interface", + "sp-std", + "sp-storage", "substrate-bip39", "thiserror", "tiny-bip39", @@ -9483,16 +9269,6 @@ dependencies = [ "syn 1.0.72", ] -[[package]] -name = "sp-debug-derive" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "proc-macro2 1.0.26", - "quote 1.0.9", - "syn 1.0.72", -] - [[package]] name = "sp-externalities" version = "0.9.0" @@ -9500,19 +9276,8 @@ source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8f dependencies = [ "environmental", "parity-scale-codec", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", -] - -[[package]] -name = "sp-externalities" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-std", + "sp-storage", ] [[package]] @@ -9524,12 +9289,12 @@ dependencies = [ "log", "parity-scale-codec", "serde", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-keystore", + "sp-runtime", + "sp-std", ] [[package]] @@ -9539,22 +9304,8 @@ source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8f dependencies = [ "parity-scale-codec", "parking_lot 0.11.1", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "thiserror", -] - -[[package]] -name = "sp-inherents" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "async-trait", - "impl-trait-for-tuples", - "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-core", + "sp-std", "thiserror", ] @@ -9569,40 +9320,15 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.11.1", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-tracing 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-wasm-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "tracing", - "tracing-core", -] - -[[package]] -name = "sp-io" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "futures 0.3.15", - "hash-db", - "libsecp256k1", - "log", - "parity-scale-codec", - "parking_lot 0.11.1", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git)", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git)", - "sp-maybe-compressed-blob 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-runtime-interface 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-tracing 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-wasm-interface 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-core", + "sp-externalities", + "sp-keystore", + "sp-runtime-interface", + "sp-state-machine", + "sp-std", + "sp-tracing", + "sp-trie", + "sp-wasm-interface", "tracing", "tracing-core", ] @@ -9613,8 +9339,8 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "lazy_static", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-runtime", "strum", ] @@ -9631,24 +9357,8 @@ dependencies = [ "parking_lot 0.11.1", "schnorrkel", "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", -] - -[[package]] -name = "sp-keystore" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "async-trait", - "derive_more 0.99.13", - "futures 0.3.15", - "merlin", - "parity-scale-codec", - "parking_lot 0.11.1", - "schnorrkel", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git)", + "sp-core", + "sp-externalities", ] [[package]] @@ -9660,15 +9370,6 @@ dependencies = [ "zstd", ] -[[package]] -name = "sp-maybe-compressed-blob" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "ruzstd", - "zstd", -] - [[package]] name = "sp-npos-elections" version = "3.0.0" @@ -9676,10 +9377,10 @@ source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8f dependencies = [ "parity-scale-codec", "serde", - "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-arithmetic", + "sp-core", "sp-npos-elections-compact", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-std", ] [[package]] @@ -9698,9 +9399,9 @@ name = "sp-offchain" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-core", + "sp-runtime", ] [[package]] @@ -9711,21 +9412,13 @@ dependencies = [ "backtrace", ] -[[package]] -name = "sp-panic-handler" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "backtrace", -] - [[package]] name = "sp-rpc" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "serde", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", ] [[package]] @@ -9742,32 +9435,11 @@ dependencies = [ "paste", "rand 0.7.3", "serde", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", -] - -[[package]] -name = "sp-runtime" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "either", - "hash256-std-hasher", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "parity-util-mem", - "paste", - "rand 0.7.3", - "serde", - "sp-application-crypto 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-application-crypto", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-std", ] [[package]] @@ -9778,29 +9450,12 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime-interface-proc-macro 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-tracing 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-wasm-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "static_assertions", -] - -[[package]] -name = "sp-runtime-interface" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "primitive-types", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git)", - "sp-runtime-interface-proc-macro 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-tracing 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-wasm-interface 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-externalities", + "sp-runtime-interface-proc-macro", + "sp-std", + "sp-storage", + "sp-tracing", + "sp-wasm-interface", "static_assertions", ] @@ -9816,18 +9471,6 @@ dependencies = [ "syn 1.0.72", ] -[[package]] -name = "sp-runtime-interface-proc-macro" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "Inflector", - "proc-macro-crate 1.0.0", - "proc-macro2 1.0.26", - "quote 1.0.9", - "syn 1.0.72", -] - [[package]] name = "sp-serializer" version = "3.0.0" @@ -9843,11 +9486,11 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "parity-scale-codec", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-staking 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-core", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -9856,18 +9499,8 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "parity-scale-codec", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", -] - -[[package]] -name = "sp-staking" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "parity-scale-codec", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-runtime", + "sp-std", ] [[package]] @@ -9882,35 +9515,12 @@ dependencies = [ "parking_lot 0.11.1", "rand 0.7.3", "smallvec 1.6.1", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-panic-handler 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "thiserror", - "trie-db", - "trie-root", -] - -[[package]] -name = "sp-state-machine" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "hash-db", - "log", - "num-traits", - "parity-scale-codec", - "parking_lot 0.11.1", - "rand 0.7.3", - "smallvec 1.6.1", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git)", - "sp-panic-handler 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-trie 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-core", + "sp-externalities", + "sp-panic-handler", + "sp-std", + "sp-trie", "thiserror", - "tracing", "trie-db", "trie-root", ] @@ -9920,11 +9530,6 @@ name = "sp-std" version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" -[[package]] -name = "sp-std" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" - [[package]] name = "sp-storage" version = "3.0.0" @@ -9934,21 +9539,8 @@ dependencies = [ "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", -] - -[[package]] -name = "sp-storage" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "ref-cast", - "serde", - "sp-debug-derive 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-debug-derive", + "sp-std", ] [[package]] @@ -9957,11 +9549,11 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "log", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime-interface 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-externalities", + "sp-io", + "sp-runtime-interface", + "sp-std", ] [[package]] @@ -9970,10 +9562,10 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" dependencies = [ "parity-scale-codec", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", + "sp-inherents", + "sp-runtime", + "sp-std", "wasm-timer", ] @@ -9984,25 +9576,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8f dependencies = [ "log", "parity-scale-codec", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "tracing", - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "sp-tracing" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "erased-serde", - "log", - "parity-scale-codec", - "parking_lot 0.10.2", - "serde", - "serde_json", - "slog", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-std", "tracing", "tracing-core", "tracing-subscriber", @@ -10018,9 +9592,9 @@ dependencies = [ "log", "parity-scale-codec", "serde", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-blockchain", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", "thiserror", ] @@ -10032,22 +9606,8 @@ dependencies = [ "hash-db", "memory-db", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "trie-db", - "trie-root", -] - -[[package]] -name = "sp-trie" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "hash-db", - "memory-db", - "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-core", + "sp-std", "trie-db", "trie-root", ] @@ -10072,33 +9632,8 @@ dependencies = [ "impl-serde", "parity-scale-codec", "serde", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", -] - -[[package]] -name = "sp-version" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "serde", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", - "sp-version-proc-macro", -] - -[[package]] -name = "sp-version-proc-macro" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "parity-scale-codec", - "proc-macro-crate 1.0.0", - "proc-macro2 1.0.26", - "quote 1.0.9", - "syn 1.0.72", + "sp-runtime", + "sp-std", ] [[package]] @@ -10108,18 +9643,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8f dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "wasmi", -] - -[[package]] -name = "sp-wasm-interface" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git#af14d493bec4d6ecdfd7b309df6c82d5d978469c" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git)", + "sp-std", "wasmi", ] @@ -10294,11 +9818,11 @@ dependencies = [ "sc-client-api", "sc-rpc-api", "serde", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-runtime", "sp-transaction-pool", ] @@ -10338,11 +9862,11 @@ dependencies = [ "serde_json", "sp-blockchain", "sp-consensus", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", "sp-keyring", - "sp-keystore 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-keystore", + "sp-runtime", + "sp-state-machine", ] [[package]] @@ -10370,7 +9894,7 @@ dependencies = [ "atty", "build-helper", "cargo_metadata", - "sp-maybe-compressed-blob 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-maybe-compressed-blob", "tempfile", "toml", "walkdir", @@ -11025,12 +10549,12 @@ dependencies = [ "sc-client-api", "sc-executor", "sc-service", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-blockchain", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-state-machine 0.9.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-externalities", + "sp-runtime", + "sp-state-machine", "structopt", ] @@ -11657,10 +11181,10 @@ source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf dependencies = [ "beefy-primitives", "bitvec", - "frame-benchmarking 3.1.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-benchmarking", "frame-executive", - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -11709,21 +11233,21 @@ dependencies = [ "serde", "serde_derive", "smallvec 1.6.1", - "sp-api 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-api", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-inherents 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-core", + "sp-inherents", + "sp-io", "sp-npos-elections", "sp-offchain", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-runtime", "sp-session", - "sp-staking 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-staking", + "sp-std", "sp-transaction-pool", - "sp-version 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-version", "static_assertions", "substrate-wasm-builder 3.0.0", ] @@ -11838,15 +11362,15 @@ name = "xcm-builder" version = "0.8.30" source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "frame-system 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "parity-scale-codec", "polkadot-parachain", - "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-arithmetic", + "sp-io", + "sp-runtime", + "sp-std", "xcm", "xcm-executor", ] @@ -11856,15 +11380,15 @@ name = "xcm-executor" version = "0.8.30" source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "frame-support", "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-arithmetic 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-core 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-io 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-runtime 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", - "sp-std 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=rococo-v1)", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "xcm", ] diff --git a/pallets/asset-index/Cargo.toml b/pallets/asset-index/Cargo.toml index 8888ee6dc2..9e57222bd3 100644 --- a/pallets/asset-index/Cargo.toml +++ b/pallets/asset-index/Cargo.toml @@ -27,6 +27,7 @@ runtime-benchmarks = [ 'pallet-remote-asset-manager/runtime-benchmarks', 'pallet-asset-depository/runtime-benchmarks', 'pallet-price-feed/runtime-benchmarks', + 'pallet-chainlink-feed/runtime-benchmarks', ] [dependencies.codec] @@ -59,6 +60,12 @@ git = 'https://github.com/paritytech/substrate' branch = 'rococo-v1' optional = true +[dependencies.pallet-chainlink-feed] +default_features = false +package = 'pallet-chainlink-feed' +git = "https://github.com/ChainSafe/chainlink-polkadot" +optional = true + [dependencies.xcm] git = "https://github.com/paritytech/polkadot" branch = 'rococo-v1' diff --git a/pallets/asset-index/src/benchmarking.rs b/pallets/asset-index/src/benchmarking.rs index 334c892c38..e43ae8306e 100644 --- a/pallets/asset-index/src/benchmarking.rs +++ b/pallets/asset-index/src/benchmarking.rs @@ -2,9 +2,10 @@ // SPDX-License-Identifier: LGPL-3.0-only use super::*; use crate::types::{AssetAvailability, IndexAssetData}; -use frame_benchmarking::{benchmarks, whitelisted_caller}; -use frame_support::traits::Currency; +use frame_benchmarking::{benchmarks, whitelisted_caller, Zero}; +use frame_support::{assert_ok, traits::Currency}; use frame_system::RawOrigin; +use pallet_chainlink_feed::Pallet as ChainlinkFeed; use xcm::v0::MultiLocation; benchmarks! { @@ -47,11 +48,21 @@ benchmarks! { // // // deposit { + // let feed_id = Zero::zero(); // let asset_id = 42.into(); + // let round_id = 0.into(); // let caller: T::AccountId = whitelisted_caller(); // let million = 1_000_000u32.into(); // T::IndexToken::deposit_creating(&caller, million); // + // // submit price feed + // assert_ok!(>::submit( + // RawOrigin::Root, + // feed_id, + // round_id, + // 0, + // )); + // // // add_asset // assert_ok!(>::add_asset( // RawOrigin::Signed(caller.clone()).into(), @@ -65,13 +76,13 @@ benchmarks! { // asset_id, // million // ) verify { - // assert_eq!( - // >::get(asset_id), - // Some(IndexAssetData::new( - // million + million, - // AssetAvailability::Liquid(MultiLocation::Null) - // )) - // ); + // // assert_eq!( + // // >::get(asset_id), + // // Some(IndexAssetData::new( + // // million + million, + // // AssetAvailability::Liquid(MultiLocation::Null) + // // )) + // // ); // } // TODO: diff --git a/pallets/committee/src/lib.rs b/pallets/committee/src/lib.rs index c96e062738..5c15332ab9 100644 --- a/pallets/committee/src/lib.rs +++ b/pallets/committee/src/lib.rs @@ -390,7 +390,7 @@ pub mod pallet { origin: OriginFor, proposal_hash: HashFor, ) -> DispatchResultWithPostInfo { - let closer = Self::ensure_member(origin.clone())?.account_id; + let closer = ensure_signed(origin.clone())?; T::ProposalExecutionOrigin::ensure_origin(origin)?; // ensure proposal has not already been executed diff --git a/pallets/price-feed/Cargo.toml b/pallets/price-feed/Cargo.toml index daab176241..80bfd9c042 100644 --- a/pallets/price-feed/Cargo.toml +++ b/pallets/price-feed/Cargo.toml @@ -15,12 +15,13 @@ std = [ 'codec/std', 'frame-support/std', 'frame-system/std', + 'pallet-balances/std', 'pallet-chainlink-feed/std', ] runtime-benchmarks = [ 'frame-benchmarking', 'frame-support/runtime-benchmarks', - # 'pallet-chainlink-feed/runtime-benchmarks', + 'pallet-chainlink-feed/runtime-benchmarks', ] [dependencies.codec] @@ -44,11 +45,7 @@ version = '3.0.0' [dependencies.pallet-chainlink-feed] default_features = false package = 'pallet-chainlink-feed' -git = "https://github.com/mattsse/chainlink-polkadot" -# this is substrate v3 branch that is upstreamed with rococo-v1 -# and requires https://github.com/ChainSafe/PINT/issues/37 -# see also https://github.com/ChainSafe/PINT/pull/39 -branch = "substrate-v3" +git = "https://github.com/ChainSafe/chainlink-polkadot" [dependencies] serde = { version = "1.0.101", optional = true } diff --git a/pallets/price-feed/src/mock.rs b/pallets/price-feed/src/mock.rs index 21d95bb04c..f563a6db4f 100644 --- a/pallets/price-feed/src/mock.rs +++ b/pallets/price-feed/src/mock.rs @@ -90,6 +90,7 @@ parameter_types! { pub const OracleLimit: u32 = 10; pub const FeedLimit: u16 = 10; pub const PruningWindow: u32 = 3; + pub const PaysFeeConf: pallet_chainlink_feed::SubmitterPaysFee = pallet_chainlink_feed::SubmitterPaysFee::FreeForValidSubmission; } pub(crate) type FeedId = u16; @@ -105,8 +106,9 @@ impl pallet_chainlink_feed::Config for Test { type StringLimit = StringLimit; type OracleCountLimit = OracleLimit; type FeedLimit = FeedLimit; - type PruningWindow = PruningWindow; - type WeightInfo = (); + type OnAnswerHandler = (); + type SubmitterPaysFee = PaysFeeConf; + type WeightInfo = pallet_chainlink_feed::default_weights::WeightInfo; } pub(crate) type AssetId = u64; @@ -209,6 +211,8 @@ impl FeedBuilder { description, restart_delay, oracles, + None, + None, ) } } diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 752774d2af..da2250004d 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -208,8 +208,7 @@ version = '0.0.1' [dependencies.pallet-chainlink-feed] default_features = false package = 'pallet-chainlink-feed' -git = "https://github.com/mattsse/chainlink-polkadot" -branch = "substrate-v3" +git = "https://github.com/ChainSafe/chainlink-polkadot" # Cumulus dependencies [dependencies.parachain-info] diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 82bf21ceb1..aa718ec59e 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -517,8 +517,8 @@ parameter_types! { pub const OracleLimit: u32 = 10; // Maximum number of feeds pub const FeedLimit: u16 = 10; - // Number of rounds to keep around per feed - pub const PruningWindow: u32 = 3; + // Free for valid submission + pub const PaysFeeConf: pallet_chainlink_feed::SubmitterPaysFee = pallet_chainlink_feed::SubmitterPaysFee::FreeForValidSubmission; } impl pallet_chainlink_feed::Config for Runtime { @@ -531,8 +531,9 @@ impl pallet_chainlink_feed::Config for Runtime { type StringLimit = StringLimit; type OracleCountLimit = OracleLimit; type FeedLimit = FeedLimit; - type PruningWindow = PruningWindow; - type WeightInfo = (); + type OnAnswerHandler = (); + type SubmitterPaysFee = PaysFeeConf; + type WeightInfo = pallet_chainlink_feed::default_weights::WeightInfo; } parameter_types! { @@ -544,7 +545,7 @@ parameter_types! { impl pallet_asset_index::Config for Runtime { // Using signed as the admin origin for testing now - type AdminOrigin = frame_system::EnsureRoot; + type AdminOrigin = frame_system::EnsureSigned; type Event = Event; type AssetId = AssetId; type IndexToken = Balances; From 31323ef521bb5191b81ee4c8e71bc25df496e25f Mon Sep 17 00:00:00 2001 From: clearloop Date: Fri, 4 Jun 2021 19:28:47 +0800 Subject: [PATCH 24/32] feat(weights): add weights to all calls --- pallets/committee/src/lib.rs | 8 ++-- pallets/local-treasury/src/benchmarking.rs | 4 +- pallets/remote-asset-manager/src/lib.rs | 2 +- pallets/saft-registry/src/lib.rs | 4 +- runtime/src/weights/pallet_asset_index.rs | 12 +++--- runtime/src/weights/pallet_committee.rs | 43 +++++++++++----------- 6 files changed, 37 insertions(+), 36 deletions(-) diff --git a/pallets/committee/src/lib.rs b/pallets/committee/src/lib.rs index 5c15332ab9..e91d9202a4 100644 --- a/pallets/committee/src/lib.rs +++ b/pallets/committee/src/lib.rs @@ -317,7 +317,7 @@ pub mod pallet { #[pallet::call] impl Pallet { - #[pallet::weight(10_000)] // TODO: Set weights + #[pallet::weight(T::WeightInfo::propose())] // TODO: Set weights /// Extrinsic to propose a new action to be voted upon in the next voting period. /// The provided action will be turned into a proposal and added to the list of current active proposals /// to be voted on in the next voting period. @@ -346,7 +346,7 @@ pub mod pallet { Ok(().into()) } - #[pallet::weight(10_000)] // TODO: Set weights + #[pallet::weight(T::WeightInfo::vote())] // TODO: Set weights /// Extrinsic to vote on an existing proposal. /// This can only be called by members of the committee. /// Successfully cast votes will be recorded in the state and a proposal @@ -382,7 +382,7 @@ pub mod pallet { Ok(().into()) } - #[pallet::weight(10_000)] // TODO: Set weights + #[pallet::weight(T::WeightInfo::close())] // TODO: Set weights /// Extrinsic to close and execute a proposal. /// Proposal must have been voted on and have majority approval. /// Only the proposal execution origin can execute. @@ -434,7 +434,7 @@ pub mod pallet { Ok(().into()) } - #[pallet::weight(10_000)] // TODO: Set weights + #[pallet::weight(T::WeightInfo::add_constituent())] // TODO: Set weights /// Add new constituent to the committee /// /// NOTE: diff --git a/pallets/local-treasury/src/benchmarking.rs b/pallets/local-treasury/src/benchmarking.rs index a598965a84..401ba3a061 100644 --- a/pallets/local-treasury/src/benchmarking.rs +++ b/pallets/local-treasury/src/benchmarking.rs @@ -12,9 +12,9 @@ benchmarks! { let admin: ::AccountId = account("admin", 0, 0); }: _( >::Signed(admin), - 10_000_u32.into(), + 5_000_000_u32.into(), admin.clone() ) verify { - + // T::Currency::freee } } diff --git a/pallets/remote-asset-manager/src/lib.rs b/pallets/remote-asset-manager/src/lib.rs index 4eeacec81a..41768737f7 100644 --- a/pallets/remote-asset-manager/src/lib.rs +++ b/pallets/remote-asset-manager/src/lib.rs @@ -89,7 +89,7 @@ pub mod pallet { #[pallet::call] impl Pallet { - #[pallet::weight(10_000)] // TODO: Set weights + #[pallet::weight(T::WeightInfo::transfer())] // TODO: Set weights pub fn transfer(_origin: OriginFor, _amount: T::Balance) -> DispatchResultWithPostInfo { Ok(().into()) } diff --git a/pallets/saft-registry/src/lib.rs b/pallets/saft-registry/src/lib.rs index b750804ae8..944752ab4f 100644 --- a/pallets/saft-registry/src/lib.rs +++ b/pallets/saft-registry/src/lib.rs @@ -88,7 +88,7 @@ pub mod pallet { #[pallet::call] impl Pallet { - #[pallet::weight(10_000)] // TODO: Set weights + #[pallet::weight(T::WeightInfo::add_saft())] // TODO: Set weights pub fn add_saft( origin: OriginFor, asset_id: T::AssetId, @@ -127,7 +127,7 @@ pub mod pallet { Ok(().into()) } - #[pallet::weight(10_000)] // TODO: Set weights + #[pallet::weight(T::WeightInfo::report_nav())] // TODO: Set weights /// Called to update the Net Asset Value (NAV) associated with /// a SAFT record in the registry pub fn report_nav( diff --git a/runtime/src/weights/pallet_asset_index.rs b/runtime/src/weights/pallet_asset_index.rs index 75fb757cfd..50a994aeb9 100644 --- a/runtime/src/weights/pallet_asset_index.rs +++ b/runtime/src/weights/pallet_asset_index.rs @@ -4,23 +4,23 @@ //! Autogenerated weights for pallet_asset_index //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-06-03, STEPS: `[]`, REPEAT: 1, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2021-06-04, STEPS: `[]`, REPEAT: 1, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 128 // Executed Command: // ./target/release/pint // benchmark +// -p +// pallet_asset_index +// -e +// add_asset // --execution // wasm // --wasm-execution // compiled -// -p -// pallet_asset_index -// -e -// * // --raw // --output -// runtime/src/weights/pallet_asset_index.rs +// ./runtime/src/weights/pallet_asset_index.rs #![allow(unused_parens)] #![allow(unused_imports)] diff --git a/runtime/src/weights/pallet_committee.rs b/runtime/src/weights/pallet_committee.rs index cf0ab3fd88..bf7a49d2af 100644 --- a/runtime/src/weights/pallet_committee.rs +++ b/runtime/src/weights/pallet_committee.rs @@ -1,3 +1,5 @@ +// Copyright 2021 ChainSafe Systems +// SPDX-License-Identifier: LGPL-3.0-only //! Autogenerated weights for pallet_committee //! @@ -20,7 +22,6 @@ // --output // runtime/src/weights/pallet_committee.rs - #![allow(unused_parens)] #![allow(unused_imports)] @@ -30,24 +31,24 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_committee. pub struct WeightInfo(PhantomData); impl pallet_committee::WeightInfo for WeightInfo { - fn propose() -> Weight { - (30_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) - } - fn vote() -> Weight { - (28_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - fn close() -> Weight { - (42_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - fn add_constituent() -> Weight { - (16_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } + fn propose() -> Weight { + (30_000_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(4 as Weight)) + } + fn vote() -> Weight { + (28_000_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn close() -> Weight { + (42_000_000 as Weight) + .saturating_add(T::DbWeight::get().reads(4 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn add_constituent() -> Weight { + (16_000_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } } From e70791c3876ce5f1b9c16c0915ac53f678d3f04c Mon Sep 17 00:00:00 2001 From: clearloop Date: Sat, 5 Jun 2021 11:54:05 +0800 Subject: [PATCH 25/32] feat(benchmark): add verification to pallet saft-registry --- pallets/asset-index/src/benchmarking.rs | 6 +++--- pallets/saft-registry/src/benchmarking.rs | 13 +++++++++++-- pallets/saft-registry/src/lib.rs | 2 ++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pallets/asset-index/src/benchmarking.rs b/pallets/asset-index/src/benchmarking.rs index e43ae8306e..64b6fb9e91 100644 --- a/pallets/asset-index/src/benchmarking.rs +++ b/pallets/asset-index/src/benchmarking.rs @@ -2,10 +2,9 @@ // SPDX-License-Identifier: LGPL-3.0-only use super::*; use crate::types::{AssetAvailability, IndexAssetData}; -use frame_benchmarking::{benchmarks, whitelisted_caller, Zero}; -use frame_support::{assert_ok, traits::Currency}; +use frame_benchmarking::{benchmarks, whitelisted_caller}; +use frame_support::traits::Currency; use frame_system::RawOrigin; -use pallet_chainlink_feed::Pallet as ChainlinkFeed; use xcm::v0::MultiLocation; benchmarks! { @@ -46,6 +45,7 @@ benchmarks! { // // AssetPriceFeed not found // + // https://github.com/ChainSafe/PINT/issues/95 // // deposit { // let feed_id = Zero::zero(); diff --git a/pallets/saft-registry/src/benchmarking.rs b/pallets/saft-registry/src/benchmarking.rs index f1d9f8ee32..0850d6d9f0 100644 --- a/pallets/saft-registry/src/benchmarking.rs +++ b/pallets/saft-registry/src/benchmarking.rs @@ -13,12 +13,18 @@ benchmarks! { 100_u32.into(), 20_u32.into() ) verify { + assert_eq!( + >::get::(0_u32.into()).as_slice(), + &[SAFTRecord::new(100_u32.into(), 20_u32.into())] + ); } // TODO: // // require `remote_asset` of pallet asset-index // + // https://github.com/ChainSafe/PINT/pull/73 + // // remove_saft { // assert_ok!(>::add_saft(>::Root.into(), 0.into(), 100_u32.into(), 20_u32.into())); // }: _( @@ -32,11 +38,14 @@ benchmarks! { report_nav { assert_ok!(>::add_saft(>::Root.into(), 0.into(), 100_u32.into(), 20_u32.into())); }: _( - // >::Signed(whitelisted_caller()), >::Root, 0.into(), 0, - 100_u32.into() + 1000_u32.into() ) verify { + assert_eq!( + >::get::(0_u32.into()).as_slice(), + &[SAFTRecord::new(1000_u32.into(), 20_u32.into())] + ); } } diff --git a/pallets/saft-registry/src/lib.rs b/pallets/saft-registry/src/lib.rs index 944752ab4f..4696b1c1b6 100644 --- a/pallets/saft-registry/src/lib.rs +++ b/pallets/saft-registry/src/lib.rs @@ -160,6 +160,8 @@ pub mod pallet { fn add_saft() -> Weight; // TODO: (incompleted) // + // https://github.com/ChainSafe/PINT/pull/73 + // // fn remove_saft() -> Weight; fn report_nav() -> Weight; } From 0fb7d14b49c3cf0cbaa021a46d895f1ff7727557 Mon Sep 17 00:00:00 2001 From: clearloop Date: Sat, 5 Jun 2021 12:04:27 +0800 Subject: [PATCH 26/32] feat(benchmark): add verification to pallet price-feed --- pallets/price-feed/src/benchmarking.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pallets/price-feed/src/benchmarking.rs b/pallets/price-feed/src/benchmarking.rs index 9df79f264f..2bee51e31a 100644 --- a/pallets/price-feed/src/benchmarking.rs +++ b/pallets/price-feed/src/benchmarking.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LGPL-3.0-only use super::*; use frame_benchmarking::{benchmarks, Zero}; -use frame_support::traits::Get; +use frame_support::{assert_noop, traits::Get}; use frame_system::Origin; benchmarks! { @@ -12,7 +12,10 @@ benchmarks! { T::SelfAssetId::get(), Zero::zero() ) verify { - + assert_noop!( + >::get_price(T::SelfAssetId::get()), + >::AssetPriceFeedNotFound + ); } untrack_asset_price_feed { @@ -20,6 +23,6 @@ benchmarks! { >::Root, T::SelfAssetId::get() ) verify { - + assert_eq!(>::get::(T::SelfAssetId::get()), None); } } From 1c3c6cc0933e188c982056da188e7ecf2fd090d4 Mon Sep 17 00:00:00 2001 From: clearloop Date: Sat, 5 Jun 2021 12:36:51 +0800 Subject: [PATCH 27/32] feat(benchmark): add verification to pallet local-treasury --- pallets/local-treasury/src/benchmarking.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pallets/local-treasury/src/benchmarking.rs b/pallets/local-treasury/src/benchmarking.rs index 401ba3a061..5eddb88de9 100644 --- a/pallets/local-treasury/src/benchmarking.rs +++ b/pallets/local-treasury/src/benchmarking.rs @@ -11,10 +11,13 @@ benchmarks! { T::Currency::deposit_creating(&local_treasury, 10_000_000_u32.into()); let admin: ::AccountId = account("admin", 0, 0); }: _( - >::Signed(admin), + >::Root, 5_000_000_u32.into(), admin.clone() ) verify { - // T::Currency::freee + assert_eq!( + T::Currency::free_balance(&admin), + 5_000_000_u32.into(), + ); } } From bc1dc9834da6e609b6ef8879f1938c981807c0d4 Mon Sep 17 00:00:00 2001 From: clearloop Date: Sat, 5 Jun 2021 14:17:39 +0800 Subject: [PATCH 28/32] feat(benchmark): add verification to pallet committee --- pallets/committee/src/benchmarking.rs | 33 +++++++++++++++------------ 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/pallets/committee/src/benchmarking.rs b/pallets/committee/src/benchmarking.rs index e2a49a8185..42246bdcf1 100644 --- a/pallets/committee/src/benchmarking.rs +++ b/pallets/committee/src/benchmarking.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LGPL-3.0-only use super::*; use frame_benchmarking::{account, benchmarks, vec, whitelisted_caller, Box}; -use frame_support::{assert_ok, traits::Get}; +use frame_support::{assert_noop, assert_ok, traits::Get}; use frame_system::{Call as SystemCall, Pallet as System, RawOrigin as SystemOrigin}; fn submit_proposal(caller: T::AccountId) -> pallet::Proposal { @@ -18,13 +18,12 @@ fn submit_proposal(caller: T::AccountId) -> pallet::Proposal { benchmarks! { propose { let caller: T::AccountId = whitelisted_caller(); + let proposal = submit_proposal::(caller.clone()); }: _( - SystemOrigin::Signed(caller), + SystemOrigin::Signed(caller.clone()), Box::new(>::remark(vec![0; 0]).into()) ) verify { - // TODO: - // - // verify last event + assert!(>::get_proposal(&proposal.hash()) == Some(proposal)); } vote { @@ -33,15 +32,20 @@ benchmarks! { assert_ok!(>::add_constituent(SystemOrigin::Root.into(), caller.clone())); // run to voting period - >::set_block_number(>::block_number() + ::VotingPeriod::get() + ::ProposalSubmissionPeriod::get() + 1_u32.into()); + >::set_block_number( + >::block_number() + + ::VotingPeriod::get() + + ::ProposalSubmissionPeriod::get() + 1_u32.into(), + ); }: _( - SystemOrigin::Signed(caller), + SystemOrigin::Signed(caller.clone()), proposal.hash(), Vote::Abstain ) verify { - // TODO: - // - // verify last event + assert_eq!( + >::get_votes_for(&proposal.hash()).unwrap().votes.len(), + 1, + ); } close { @@ -74,12 +78,13 @@ benchmarks! { + 1_u32.into() ); }: _( - SystemOrigin::Signed(caller), + SystemOrigin::Signed(caller.clone()), proposal.hash() ) verify { - // TODO: - // - // verify last event + assert_noop!( + >::close(SystemOrigin::Signed(caller.clone()).into(), proposal.hash()), + >::ProposalAlreadyExecuted + ); } add_constituent { From a25b48f1616478227c863b9f7ba79173a874ca4b Mon Sep 17 00:00:00 2001 From: clearloop Date: Mon, 7 Jun 2021 17:43:25 +0800 Subject: [PATCH 29/32] feat(benchmarks): clean useless code --- pallets/committee/src/benchmarking.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pallets/committee/src/benchmarking.rs b/pallets/committee/src/benchmarking.rs index 42246bdcf1..2c8c25a3e3 100644 --- a/pallets/committee/src/benchmarking.rs +++ b/pallets/committee/src/benchmarking.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LGPL-3.0-only use super::*; use frame_benchmarking::{account, benchmarks, vec, whitelisted_caller, Box}; -use frame_support::{assert_noop, assert_ok, traits::Get}; +use frame_support::{assert_ok, traits::Get}; use frame_system::{Call as SystemCall, Pallet as System, RawOrigin as SystemOrigin}; fn submit_proposal(caller: T::AccountId) -> pallet::Proposal { @@ -78,11 +78,11 @@ benchmarks! { + 1_u32.into() ); }: _( - SystemOrigin::Signed(caller.clone()), + SystemOrigin::Signed(caller), proposal.hash() ) verify { assert_noop!( - >::close(SystemOrigin::Signed(caller.clone()).into(), proposal.hash()), + >::close(SystemOrigin::S(caller.clone()), proposal.hash()), >::ProposalAlreadyExecuted ); } From 93c474f412db6ab8975a3b09884f241b26aea3e3 Mon Sep 17 00:00:00 2001 From: clearloop Date: Mon, 7 Jun 2021 19:38:35 +0800 Subject: [PATCH 30/32] Revert "feat(benchmarks): clean useless code" This reverts commit a25b48f1616478227c863b9f7ba79173a874ca4b. --- pallets/committee/src/benchmarking.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pallets/committee/src/benchmarking.rs b/pallets/committee/src/benchmarking.rs index 2c8c25a3e3..42246bdcf1 100644 --- a/pallets/committee/src/benchmarking.rs +++ b/pallets/committee/src/benchmarking.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LGPL-3.0-only use super::*; use frame_benchmarking::{account, benchmarks, vec, whitelisted_caller, Box}; -use frame_support::{assert_ok, traits::Get}; +use frame_support::{assert_noop, assert_ok, traits::Get}; use frame_system::{Call as SystemCall, Pallet as System, RawOrigin as SystemOrigin}; fn submit_proposal(caller: T::AccountId) -> pallet::Proposal { @@ -78,11 +78,11 @@ benchmarks! { + 1_u32.into() ); }: _( - SystemOrigin::Signed(caller), + SystemOrigin::Signed(caller.clone()), proposal.hash() ) verify { assert_noop!( - >::close(SystemOrigin::S(caller.clone()), proposal.hash()), + >::close(SystemOrigin::Signed(caller.clone()).into(), proposal.hash()), >::ProposalAlreadyExecuted ); } From 9ae7704e33013fdd4f391ec78784dacd53b08ee7 Mon Sep 17 00:00:00 2001 From: clearloop Date: Tue, 8 Jun 2021 18:32:58 +0800 Subject: [PATCH 31/32] perf(benchmark): remote TODOs for setting weights --- pallets/asset-index/src/lib.rs | 2 +- pallets/local-treasury/src/lib.rs | 2 +- pallets/remote-asset-manager/src/lib.rs | 2 +- pallets/saft-registry/src/lib.rs | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pallets/asset-index/src/lib.rs b/pallets/asset-index/src/lib.rs index 8929d4f68a..bfca3783f9 100644 --- a/pallets/asset-index/src/lib.rs +++ b/pallets/asset-index/src/lib.rs @@ -164,7 +164,7 @@ pub mod pallet { #[pallet::call] impl Pallet { - #[pallet::weight(T::WeightInfo::add_asset())] // TODO: Set weights + #[pallet::weight(T::WeightInfo::add_asset())] /// Callable by an admin to add new assets to the index and mint some IndexToken /// Caller balance is updated to allocate the correct amount of the IndexToken /// Creates IndexAssetData if it doesn’t exist, otherwise adds to list of deposits diff --git a/pallets/local-treasury/src/lib.rs b/pallets/local-treasury/src/lib.rs index 269dd6b4dd..29b36377c1 100644 --- a/pallets/local-treasury/src/lib.rs +++ b/pallets/local-treasury/src/lib.rs @@ -76,7 +76,7 @@ pub mod pallet { #[pallet::call] impl Pallet { /// Transfer balance from the treasury to another account. Only callable by the AdminOrigin. - #[pallet::weight(T::WeightInfo::withdraw())] // TODO: Set weights + #[pallet::weight(T::WeightInfo::withdraw())] pub fn withdraw( origin: OriginFor, amount: BalanceFor, diff --git a/pallets/remote-asset-manager/src/lib.rs b/pallets/remote-asset-manager/src/lib.rs index 41768737f7..d4dd832ce6 100644 --- a/pallets/remote-asset-manager/src/lib.rs +++ b/pallets/remote-asset-manager/src/lib.rs @@ -89,7 +89,7 @@ pub mod pallet { #[pallet::call] impl Pallet { - #[pallet::weight(T::WeightInfo::transfer())] // TODO: Set weights + #[pallet::weight(T::WeightInfo::transfer())] pub fn transfer(_origin: OriginFor, _amount: T::Balance) -> DispatchResultWithPostInfo { Ok(().into()) } diff --git a/pallets/saft-registry/src/lib.rs b/pallets/saft-registry/src/lib.rs index 4696b1c1b6..cf72257167 100644 --- a/pallets/saft-registry/src/lib.rs +++ b/pallets/saft-registry/src/lib.rs @@ -88,7 +88,7 @@ pub mod pallet { #[pallet::call] impl Pallet { - #[pallet::weight(T::WeightInfo::add_saft())] // TODO: Set weights + #[pallet::weight(T::WeightInfo::add_saft())] pub fn add_saft( origin: OriginFor, asset_id: T::AssetId, @@ -127,7 +127,7 @@ pub mod pallet { Ok(().into()) } - #[pallet::weight(T::WeightInfo::report_nav())] // TODO: Set weights + #[pallet::weight(T::WeightInfo::report_nav())] /// Called to update the Net Asset Value (NAV) associated with /// a SAFT record in the registry pub fn report_nav( From b22b6542af6c3a7424cb47c57cdfde864c9caa5d Mon Sep 17 00:00:00 2001 From: clearloop Date: Tue, 8 Jun 2021 18:35:30 +0800 Subject: [PATCH 32/32] perf(benchmark): remove comments on the benchmarking of pallet-index --- pallets/asset-index/src/benchmarking.rs | 68 ------------------------- 1 file changed, 68 deletions(-) diff --git a/pallets/asset-index/src/benchmarking.rs b/pallets/asset-index/src/benchmarking.rs index 64b6fb9e91..016a2475a5 100644 --- a/pallets/asset-index/src/benchmarking.rs +++ b/pallets/asset-index/src/benchmarking.rs @@ -27,73 +27,5 @@ benchmarks! { AssetAvailability::Liquid(MultiLocation::Null) )) ); - // TODO: - // - // We are using `deposit_into_existing` currently now which means - // we could not add asset to an account which has no balance - // - // assert_eq!(>::index_token_balance(&caller), total); - - // TODO: - // - // The value of `total_token_issuance` is not correct - // - // assert_eq!(>::index_token_issuance(), total); } - - // TODO: - // - // AssetPriceFeed not found - // - // https://github.com/ChainSafe/PINT/issues/95 - // - // deposit { - // let feed_id = Zero::zero(); - // let asset_id = 42.into(); - // let round_id = 0.into(); - // let caller: T::AccountId = whitelisted_caller(); - // let million = 1_000_000u32.into(); - // T::IndexToken::deposit_creating(&caller, million); - // - // // submit price feed - // assert_ok!(>::submit( - // RawOrigin::Root, - // feed_id, - // round_id, - // 0, - // )); - // - // // add_asset - // assert_ok!(>::add_asset( - // RawOrigin::Signed(caller.clone()).into(), - // asset_id, - // million, - // AssetAvailability::Liquid(MultiLocation::Null), - // million - // )); - // }: _( - // RawOrigin::Signed(caller.clone()), - // asset_id, - // million - // ) verify { - // // assert_eq!( - // // >::get(asset_id), - // // Some(IndexAssetData::new( - // // million + million, - // // AssetAvailability::Liquid(MultiLocation::Null) - // // )) - // // ); - // } - - // TODO: - // - // Too complex and incompleted - // - // withdraw { - // - // }: _( - // - // ) verify { - // - // } }