From 36971ec2ee80f0a60f1362193d7fee636186befa Mon Sep 17 00:00:00 2001 From: Dan Forbes Date: Wed, 6 May 2020 13:25:03 -0700 Subject: [PATCH] Update to 2.0.0-alpha.7 (#38) Closes #35 Thanks to @brenzi for the work he did on #36 I copied a lot of it :pray: --- Cargo.lock | 605 +++++++++++++++++------------------ node/Cargo.toml | 66 ++-- node/src/service.rs | 29 +- pallets/template/Cargo.toml | 12 +- pallets/template/src/lib.rs | 4 +- pallets/template/src/mock.rs | 3 + runtime/Cargo.toml | 50 +-- runtime/src/lib.rs | 19 +- 8 files changed, 402 insertions(+), 386 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dc0f207..b945f1a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -767,33 +767,6 @@ dependencies = [ "serde", ] -[[package]] -name = "ethbloom" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "befe713756981dbbda28e23f5c65c85de512915db695284342cc2ee36b7a184f" -dependencies = [ - "crunchy", - "fixed-hash", - "impl-rlp", - "impl-serde 0.3.1", - "tiny-keccak", -] - -[[package]] -name = "ethereum-types" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8616dc6a7bc7d81ab8a6425635299ee3582975d4ddeb9312b8b0b8ea54dfecf8" -dependencies = [ - "ethbloom", - "fixed-hash", - "impl-rlp", - "impl-serde 0.3.1", - "primitive-types", - "uint", -] - [[package]] name = "exit-future" version = "0.2.0" @@ -842,10 +815,11 @@ dependencies = [ [[package]] name = "finality-grandpa" -version = "0.11.2" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "024517816630be5204eba201e8d1d405042b1255a5e0e3f298b054fc24d59e1d" +checksum = "1f4682570188cd105606e621b9992e580f717c15f8cd1b7d106b59f1c6e54680" dependencies = [ + "either", "futures 0.3.4", "futures-timer 2.0.2", "log", @@ -893,16 +867,16 @@ checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" [[package]] name = "fork-tree" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "parity-scale-codec", ] [[package]] name = "frame-benchmarking" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "frame-support", "frame-system", @@ -918,21 +892,23 @@ dependencies = [ [[package]] name = "frame-executive" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "serde", + "sp-io", "sp-runtime", "sp-std", + "sp-tracing", ] [[package]] name = "frame-metadata" -version = "11.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "11.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "parity-scale-codec", "serde", @@ -942,8 +918,8 @@ dependencies = [ [[package]] name = "frame-support" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "bitmask", "frame-metadata", @@ -961,13 +937,13 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-std", - "tracing", + "sp-tracing", ] [[package]] name = "frame-support-procedural" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "frame-support-procedural-tools", "proc-macro2", @@ -977,8 +953,8 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -989,8 +965,8 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "proc-macro2", "quote 1.0.4", @@ -999,8 +975,8 @@ dependencies = [ [[package]] name = "frame-system" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1578,15 +1554,6 @@ dependencies = [ "parity-scale-codec", ] -[[package]] -name = "impl-rlp" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f7a72f11830b52333f36e3b09a288333888bf54380fd0ac0790a3c31ab0f3c5" -dependencies = [ - "rlp", -] - [[package]] name = "impl-serde" version = "0.2.3" @@ -1656,6 +1623,12 @@ dependencies = [ "libc", ] +[[package]] +name = "ip_network" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ee15951c035f79eddbef745611ec962f63f4558f1dadf98ab723cc603487c6f" + [[package]] name = "ipnet" version = "2.3.0" @@ -2236,9 +2209,9 @@ dependencies = [ [[package]] name = "linked-hash-map" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" +checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" [[package]] name = "linked_hash_set" @@ -2314,6 +2287,16 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +[[package]] +name = "memmap" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" +dependencies = [ + "libc", + "winapi 0.3.8", +] + [[package]] name = "memoffset" version = "0.5.4" @@ -2517,15 +2500,15 @@ dependencies = [ [[package]] name = "node-template" -version = "2.0.0-alpha.6" +version = "2.0.0-alpha.7" dependencies = [ "futures 0.3.4", "log", "node-template-runtime", "sc-basic-authorship", "sc-cli", - "sc-client", "sc-client-api", + "sc-consensus", "sc-consensus-aura", "sc-executor", "sc-finality-grandpa", @@ -2545,7 +2528,7 @@ dependencies = [ [[package]] name = "node-template-runtime" -version = "2.0.0-alpha.6" +version = "2.0.0-alpha.7" dependencies = [ "frame-executive", "frame-support", @@ -2720,8 +2703,8 @@ dependencies = [ [[package]] name = "pallet-aura" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "frame-support", "frame-system", @@ -2741,8 +2724,8 @@ dependencies = [ [[package]] name = "pallet-balances" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "frame-benchmarking", "frame-support", @@ -2756,8 +2739,8 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "frame-support", "frame-system", @@ -2772,8 +2755,8 @@ dependencies = [ [[package]] name = "pallet-grandpa" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "frame-support", "frame-system", @@ -2790,8 +2773,8 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "frame-support", "frame-system", @@ -2803,8 +2786,8 @@ dependencies = [ [[package]] name = "pallet-session" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "frame-support", "frame-system", @@ -2821,8 +2804,8 @@ dependencies = [ [[package]] name = "pallet-sudo" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "frame-support", "frame-system", @@ -2835,7 +2818,7 @@ dependencies = [ [[package]] name = "pallet-template" -version = "2.0.0-alpha.6" +version = "2.0.0-alpha.7" dependencies = [ "frame-support", "frame-system", @@ -2847,8 +2830,8 @@ dependencies = [ [[package]] name = "pallet-timestamp" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "frame-benchmarking", "frame-support", @@ -2864,8 +2847,8 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "frame-support", "frame-system", @@ -2877,8 +2860,8 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "frame-support", "parity-scale-codec", @@ -2888,6 +2871,20 @@ dependencies = [ "sp-std", ] +[[package]] +name = "parity-db" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00d595e372d119261593297debbe4193811a4dc811d2a1ccbb8caaa6666ad7ab" +dependencies = [ + "blake2-rfc", + "crc32fast", + "libc", + "log", + "memmap", + "parking_lot 0.10.2", +] + [[package]] name = "parity-multiaddr" version = "0.7.3" @@ -2977,10 +2974,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c6e2583649a3ca84894d1d71da249abcfda54d5aca24733d72ca10d0f02361c" dependencies = [ "cfg-if", - "ethereum-types", - "hashbrown", "impl-trait-for-tuples", - "lru", "parity-util-mem-derive", "parking_lot 0.10.2", "primitive-types", @@ -3173,7 +3167,6 @@ checksum = "c55c21c64d0eaa4d7ed885d959ef2d62d9e488c27c0e02d9aa5ce6c877b7d5f8" dependencies = [ "fixed-hash", "impl-codec", - "impl-rlp", "impl-serde 0.3.1", "uint", ] @@ -3408,7 +3401,7 @@ dependencies = [ "rand_isaac", "rand_jitter", "rand_os", - "rand_pcg", + "rand_pcg 0.1.2", "rand_xorshift", "winapi 0.3.8", ] @@ -3424,6 +3417,7 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc 0.2.0", + "rand_pcg 0.2.1", ] [[package]] @@ -3532,6 +3526,15 @@ dependencies = [ "rand_core 0.4.2", ] +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + [[package]] name = "rand_xorshift" version = "0.1.1" @@ -3586,6 +3589,26 @@ version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" +[[package]] +name = "ref-cast" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a214c7875e1b63fc1618db7c80efc0954f6156c9ff07699fd9039e255accdd1" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "602eb59cda66fcb9aec25841fb76bc01d2b34282dcdd705028da297db6f3eec8" +dependencies = [ + "proc-macro2", + "quote 1.0.4", + "syn 1.0.18", +] + [[package]] name = "regex" version = "1.3.7" @@ -3634,15 +3657,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac" -[[package]] -name = "rlp" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a7d3f9bed94764eac15b8f14af59fac420c236adaff743b7bcc88e265cb4345" -dependencies = [ - "rustc-hex", -] - [[package]] name = "rocksdb" version = "0.13.0" @@ -3743,8 +3757,8 @@ dependencies = [ [[package]] name = "sc-basic-authorship" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "futures 0.3.4", "futures-timer 3.0.2", @@ -3765,8 +3779,8 @@ dependencies = [ [[package]] name = "sc-block-builder" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -3781,8 +3795,8 @@ dependencies = [ [[package]] name = "sc-chain-spec" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -3797,8 +3811,8 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -3808,8 +3822,8 @@ dependencies = [ [[package]] name = "sc-cli" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "ansi_term 0.12.1", "app_dirs", @@ -3848,45 +3862,10 @@ dependencies = [ "tokio 0.2.20", ] -[[package]] -name = "sc-client" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" -dependencies = [ - "derive_more", - "fnv", - "futures 0.3.4", - "hash-db", - "hex-literal", - "kvdb", - "log", - "parity-scale-codec", - "parking_lot 0.10.2", - "sc-block-builder", - "sc-client-api", - "sc-executor", - "sc-telemetry", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-externalities", - "sp-inherents", - "sp-keyring", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", - "sp-utils", - "sp-version", - "substrate-prometheus-endpoint", - "tracing", -] - [[package]] name = "sc-client-api" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "derive_more", "fnv", @@ -3904,6 +3883,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", + "sp-database", "sp-externalities", "sp-inherents", "sp-keyring", @@ -3915,39 +3895,53 @@ dependencies = [ "sp-trie", "sp-utils", "sp-version", + "substrate-prometheus-endpoint", ] [[package]] name = "sc-client-db" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ + "blake2-rfc", "hash-db", "kvdb", "kvdb-memorydb", "kvdb-rocksdb", "linked-hash-map", "log", + "parity-db", "parity-scale-codec", "parity-util-mem", "parking_lot 0.10.2", - "sc-client", "sc-client-api", "sc-executor", "sc-state-db", "sp-blockchain", "sp-consensus", "sp-core", + "sp-database", "sp-runtime", "sp-state-machine", "sp-trie", "substrate-prometheus-endpoint", ] +[[package]] +name = "sc-consensus" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" +dependencies = [ + "sc-client-api", + "sp-blockchain", + "sp-consensus", + "sp-runtime", +] + [[package]] name = "sc-consensus-aura" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "derive_more", "futures 0.3.4", @@ -3956,7 +3950,6 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.10.2", "sc-block-builder", - "sc-client", "sc-client-api", "sc-consensus-slots", "sc-keystore", @@ -3977,8 +3970,8 @@ dependencies = [ [[package]] name = "sc-consensus-slots" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "futures 0.3.4", "futures-timer 3.0.2", @@ -3998,8 +3991,8 @@ dependencies = [ [[package]] name = "sc-executor" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "derive_more", "lazy_static", @@ -4010,6 +4003,7 @@ dependencies = [ "parking_lot 0.10.2", "sc-executor-common", "sc-executor-wasmi", + "sp-api", "sp-core", "sp-externalities", "sp-io", @@ -4024,8 +4018,8 @@ dependencies = [ [[package]] name = "sc-executor-common" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "derive_more", "log", @@ -4041,8 +4035,8 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "log", "parity-scale-codec", @@ -4056,10 +4050,11 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "assert_matches", + "derive_more", "finality-grandpa", "fork-tree", "futures 0.3.4", @@ -4070,8 +4065,8 @@ dependencies = [ "pin-project", "rand 0.7.3", "sc-block-builder", - "sc-client", "sc-client-api", + "sc-consensus", "sc-keystore", "sc-network", "sc-network-gossip", @@ -4092,8 +4087,8 @@ dependencies = [ [[package]] name = "sc-informant" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "ansi_term 0.12.1", "futures 0.3.4", @@ -4109,8 +4104,8 @@ dependencies = [ [[package]] name = "sc-keystore" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "derive_more", "hex", @@ -4124,8 +4119,8 @@ dependencies = [ [[package]] name = "sc-network" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "bitflags", "bytes 0.5.4", @@ -4138,6 +4133,7 @@ dependencies = [ "futures-timer 3.0.2", "futures_codec", "hex", + "ip_network", "libp2p", "linked-hash-map", "linked_hash_set", @@ -4151,7 +4147,6 @@ dependencies = [ "prost-build", "rand 0.7.3", "sc-block-builder", - "sc-client", "sc-client-api", "sc-peerset", "serde", @@ -4162,7 +4157,6 @@ dependencies = [ "sp-arithmetic", "sp-blockchain", "sp-consensus", - "sp-consensus-babe", "sp-core", "sp-runtime", "sp-utils", @@ -4176,8 +4170,8 @@ dependencies = [ [[package]] name = "sc-network-gossip" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "futures 0.3.4", "futures-timer 3.0.2", @@ -4192,8 +4186,8 @@ dependencies = [ [[package]] name = "sc-offchain" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "bytes 0.5.4", "fnv", @@ -4219,8 +4213,8 @@ dependencies = [ [[package]] name = "sc-peerset" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "futures 0.3.4", "libp2p", @@ -4232,8 +4226,8 @@ dependencies = [ [[package]] name = "sc-rpc" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "futures 0.3.4", "hash-db", @@ -4243,7 +4237,6 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.10.2", "sc-block-builder", - "sc-client", "sc-client-api", "sc-executor", "sc-keystore", @@ -4265,8 +4258,8 @@ dependencies = [ [[package]] name = "sc-rpc-api" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "derive_more", "futures 0.3.4", @@ -4289,8 +4282,8 @@ dependencies = [ [[package]] name = "sc-rpc-server" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -4304,15 +4297,15 @@ dependencies = [ [[package]] name = "sc-service" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "derive_more", "exit-future", "futures 0.1.29", "futures 0.3.4", - "futures-diagnose", "futures-timer 3.0.2", + "hash-db", "lazy_static", "log", "netstat2", @@ -4320,9 +4313,11 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "parking_lot 0.10.2", + "pin-project", "procfs", + "rand 0.7.3", + "sc-block-builder", "sc-chain-spec", - "sc-client", "sc-client-api", "sc-client-db", "sc-executor", @@ -4339,14 +4334,19 @@ dependencies = [ "slog", "sp-api", "sp-application-crypto", + "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-core", + "sp-externalities", "sp-io", "sp-runtime", "sp-session", + "sp-state-machine", "sp-transaction-pool", + "sp-trie", "sp-utils", + "sp-version", "substrate-prometheus-endpoint", "sysinfo", "tracing", @@ -4355,8 +4355,8 @@ dependencies = [ [[package]] name = "sc-state-db" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "log", "parity-scale-codec", @@ -4369,8 +4369,8 @@ dependencies = [ [[package]] name = "sc-telemetry" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "bytes 0.5.4", "futures 0.3.4", @@ -4391,8 +4391,8 @@ dependencies = [ [[package]] name = "sc-tracing" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "erased-serde", "log", @@ -4406,8 +4406,8 @@ dependencies = [ [[package]] name = "sc-transaction-graph" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "derive_more", "futures 0.3.4", @@ -4426,8 +4426,8 @@ dependencies = [ [[package]] name = "sc-transaction-pool" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "derive_more", "futures 0.3.4", @@ -4443,8 +4443,10 @@ dependencies = [ "sp-blockchain", "sp-core", "sp-runtime", + "sp-tracing", "sp-transaction-pool", "sp-utils", + "substrate-prometheus-endpoint", "wasm-timer", ] @@ -4741,8 +4743,8 @@ dependencies = [ [[package]] name = "sp-allocator" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "derive_more", "log", @@ -4753,8 +4755,8 @@ dependencies = [ [[package]] name = "sp-api" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "hash-db", "parity-scale-codec", @@ -4768,8 +4770,8 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -4780,8 +4782,8 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "parity-scale-codec", "serde", @@ -4792,8 +4794,8 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "integer-sqrt", "num-traits 0.2.11", @@ -4806,8 +4808,8 @@ dependencies = [ [[package]] name = "sp-block-builder" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "parity-scale-codec", "sp-api", @@ -4818,8 +4820,8 @@ dependencies = [ [[package]] name = "sp-blockchain" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "derive_more", "log", @@ -4834,8 +4836,8 @@ dependencies = [ [[package]] name = "sp-chain-spec" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "serde", "serde_json", @@ -4843,12 +4845,11 @@ dependencies = [ [[package]] name = "sp-consensus" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "derive_more", "futures 0.3.4", - "futures-diagnose", "futures-timer 3.0.2", "libp2p", "log", @@ -4866,8 +4867,8 @@ dependencies = [ [[package]] name = "sp-consensus-aura" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "parity-scale-codec", "sp-api", @@ -4878,38 +4879,10 @@ dependencies = [ "sp-timestamp", ] -[[package]] -name = "sp-consensus-babe" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" -dependencies = [ - "parity-scale-codec", - "sp-api", - "sp-application-crypto", - "sp-consensus", - "sp-consensus-vrf", - "sp-inherents", - "sp-runtime", - "sp-std", - "sp-timestamp", -] - -[[package]] -name = "sp-consensus-vrf" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" -dependencies = [ - "parity-scale-codec", - "schnorrkel", - "sp-core", - "sp-runtime", - "sp-std", -] - [[package]] name = "sp-core" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "base58", "blake2-rfc", @@ -4923,6 +4896,7 @@ dependencies = [ "lazy_static", "libsecp256k1", "log", + "merlin", "num-traits 0.2.11", "parity-scale-codec", "parity-util-mem", @@ -4946,10 +4920,19 @@ dependencies = [ "zeroize", ] +[[package]] +name = "sp-database" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" +dependencies = [ + "kvdb", + "parking_lot 0.10.2", +] + [[package]] name = "sp-debug-derive" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "proc-macro2", "quote 1.0.4", @@ -4958,18 +4941,19 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "environmental", + "parity-scale-codec", "sp-std", "sp-storage", ] [[package]] name = "sp-finality-grandpa" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "parity-scale-codec", "serde", @@ -4981,8 +4965,8 @@ dependencies = [ [[package]] name = "sp-finality-tracker" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -4991,8 +4975,8 @@ dependencies = [ [[package]] name = "sp-inherents" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "derive_more", "parity-scale-codec", @@ -5003,13 +4987,15 @@ dependencies = [ [[package]] name = "sp-io" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ + "futures 0.3.4", "hash-db", "libsecp256k1", "log", "parity-scale-codec", + "parking_lot 0.10.2", "sp-core", "sp-externalities", "sp-runtime-interface", @@ -5021,8 +5007,8 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "lazy_static", "sp-core", @@ -5032,17 +5018,18 @@ dependencies = [ [[package]] name = "sp-offchain" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "sp-api", + "sp-core", "sp-runtime", ] [[package]] name = "sp-panic-handler" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "backtrace", "log", @@ -5050,8 +5037,8 @@ dependencies = [ [[package]] name = "sp-rpc" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "serde", "sp-core", @@ -5059,8 +5046,8 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "hash256-std-hasher", "impl-trait-for-tuples", @@ -5080,22 +5067,23 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "parity-scale-codec", "primitive-types", "sp-externalities", "sp-runtime-interface-proc-macro", "sp-std", + "sp-tracing", "sp-wasm-interface", "static_assertions", ] [[package]] name = "sp-runtime-interface-proc-macro" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "Inflector", "proc-macro-crate", @@ -5106,8 +5094,8 @@ dependencies = [ [[package]] name = "sp-serializer" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "serde", "serde_json", @@ -5115,8 +5103,8 @@ dependencies = [ [[package]] name = "sp-session" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "sp-api", "sp-core", @@ -5126,8 +5114,8 @@ dependencies = [ [[package]] name = "sp-staking" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -5136,8 +5124,8 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "hash-db", "log", @@ -5155,15 +5143,16 @@ dependencies = [ [[package]] name = "sp-std" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" [[package]] name = "sp-storage" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "impl-serde 0.2.3", + "ref-cast", "serde", "sp-debug-derive", "sp-std", @@ -5171,8 +5160,8 @@ dependencies = [ [[package]] name = "sp-timestamp" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -5183,10 +5172,18 @@ dependencies = [ "wasm-timer", ] +[[package]] +name = "sp-tracing" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" +dependencies = [ + "tracing", +] + [[package]] name = "sp-transaction-pool" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "derive_more", "futures 0.3.4", @@ -5200,8 +5197,8 @@ dependencies = [ [[package]] name = "sp-trie" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "hash-db", "memory-db", @@ -5214,8 +5211,8 @@ dependencies = [ [[package]] name = "sp-utils" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "futures 0.3.4", "futures-core", @@ -5225,8 +5222,8 @@ dependencies = [ [[package]] name = "sp-version" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -5237,8 +5234,8 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -5347,16 +5344,16 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" -version = "2.0.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "2.0.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "platforms", ] [[package]] name = "substrate-prometheus-endpoint" -version = "0.8.0-alpha.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.6#67f354f57e738fa575775f7fa0fb903e8972182b" +version = "0.8.0-alpha.7" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-alpha.7#83a6f1add7957160283ac5d7e627da06beb725d9" dependencies = [ "async-std", "derive_more", @@ -5370,7 +5367,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.5" -source = "git+https://github.com/paritytech/substrate.git#3f27afa8640138c9942ceb09016da47ab7a5afaa" +source = "git+https://github.com/paritytech/substrate.git#a2512e837003db3d3267764283edf31cf95a206c" [[package]] name = "subtle" @@ -5440,9 +5437,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.12.0" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ccb41798287e8e299a701b5560d886d6ca2c3e7115e9ea2cb68c123aec339b7" +checksum = "1cac193374347e7c263c5f547524f36ff8ec6702d56c8799c8331d26dffe8c1e" dependencies = [ "cfg-if", "doc-comment", diff --git a/node/Cargo.toml b/node/Cargo.toml index 03b9f7b..df66af1 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -7,7 +7,7 @@ homepage = 'https://substrate.dev' license = 'Unlicense' name = 'node-template' repository = 'https://github.com/paritytech/substrate/' -version = '2.0.0-alpha.6' +version = '2.0.0-alpha.7' [package.metadata.docs.rs] targets = ['x86_64-unknown-linux-gnu'] @@ -19,89 +19,89 @@ structopt = '0.3.8' [dependencies.node-template-runtime] path = '../runtime' -version = '2.0.0-alpha.6' +version = '2.0.0-alpha.7' [dependencies.sc-basic-authorship] git = 'https://github.com/paritytech/substrate.git' -version = '0.8.0-alpha.6' -tag = 'v2.0.0-alpha.6' +version = '0.8.0-alpha.7' +tag = 'v2.0.0-alpha.7' [dependencies.sc-cli] git = 'https://github.com/paritytech/substrate.git' -version = '0.8.0-alpha.6' -tag = 'v2.0.0-alpha.6' - -[dependencies.sc-client] -git = 'https://github.com/paritytech/substrate.git' -version = '0.8.0-alpha.6' -tag = 'v2.0.0-alpha.6' +version = '0.8.0-alpha.7' +tag = 'v2.0.0-alpha.7' [dependencies.sc-client-api] git = 'https://github.com/paritytech/substrate.git' -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' + +[dependencies.sc-consensus] +git = 'https://github.com/paritytech/substrate.git' +version = '0.8.0-alpha.7' +tag = 'v2.0.0-alpha.7' [dependencies.sc-consensus-aura] git = 'https://github.com/paritytech/substrate.git' -version = '0.8.0-alpha.6' -tag = 'v2.0.0-alpha.6' +version = '0.8.0-alpha.7' +tag = 'v2.0.0-alpha.7' [dependencies.sc-executor] git = 'https://github.com/paritytech/substrate.git' -version = '0.8.0-alpha.6' -tag = 'v2.0.0-alpha.6' +version = '0.8.0-alpha.7' +tag = 'v2.0.0-alpha.7' [dependencies.sc-finality-grandpa] git = 'https://github.com/paritytech/substrate.git' -version = '0.8.0-alpha.6' -tag = 'v2.0.0-alpha.6' +version = '0.8.0-alpha.7' +tag = 'v2.0.0-alpha.7' [dependencies.sc-network] git = 'https://github.com/paritytech/substrate.git' -version = '0.8.0-alpha.6' -tag = 'v2.0.0-alpha.6' +version = '0.8.0-alpha.7' +tag = 'v2.0.0-alpha.7' [dependencies.sc-service] git = 'https://github.com/paritytech/substrate.git' -version = '0.8.0-alpha.6' -tag = 'v2.0.0-alpha.6' +version = '0.8.0-alpha.7' +tag = 'v2.0.0-alpha.7' [dependencies.sc-transaction-pool] git = 'https://github.com/paritytech/substrate.git' -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.sp-consensus] git = 'https://github.com/paritytech/substrate.git' -version = '0.8.0-alpha.6' -tag = 'v2.0.0-alpha.6' +version = '0.8.0-alpha.7' +tag = 'v2.0.0-alpha.7' [dependencies.sp-consensus-aura] git = 'https://github.com/paritytech/substrate.git' -version = '0.8.0-alpha.6' -tag = 'v2.0.0-alpha.6' +version = '0.8.0-alpha.7' +tag = 'v2.0.0-alpha.7' [dependencies.sp-core] git = 'https://github.com/paritytech/substrate.git' -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.sp-finality-grandpa] git = 'https://github.com/paritytech/substrate.git' -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.sp-inherents] git = 'https://github.com/paritytech/substrate.git' -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.sp-runtime] git = 'https://github.com/paritytech/substrate.git' -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.sp-transaction-pool] git = 'https://github.com/paritytech/substrate.git' -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [build-dependencies.substrate-build-script-utils] git = 'https://github.com/paritytech/substrate.git' -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [[bin]] name = 'node-template' diff --git a/node/src/service.rs b/node/src/service.rs index 7c4a574..fe741f4 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -2,15 +2,17 @@ use std::sync::Arc; use std::time::Duration; -use sc_client::LongestChain; use sc_client_api::ExecutorProvider; +use sc_consensus::LongestChain; use node_template_runtime::{self, opaque::Block, RuntimeApi}; use sc_service::{error::{Error as ServiceError}, AbstractService, Configuration, ServiceBuilder}; use sp_inherents::InherentDataProviders; use sc_executor::native_executor_instance; pub use sc_executor::NativeExecutor; use sp_consensus_aura::sr25519::{AuthorityPair as AuraPair}; -use sc_finality_grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider, StorageAndProofProvider}; +use sc_finality_grandpa::{ + self, FinalityProofProvider as GrandpaFinalityProofProvider, SharedVoterState, StorageAndProofProvider +}; // Our native executor instance. native_executor_instance!( @@ -33,13 +35,13 @@ macro_rules! new_full_start { node_template_runtime::opaque::Block, node_template_runtime::RuntimeApi, crate::service::Executor >($config)? .with_select_chain(|_config, backend| { - Ok(sc_client::LongestChain::new(backend.clone())) + Ok(sc_consensus::LongestChain::new(backend.clone())) })? - .with_transaction_pool(|config, client, _fetcher| { + .with_transaction_pool(|config, client, _fetcher, prometheus_registry| { let pool_api = sc_transaction_pool::FullChainApi::new(client.clone()); - Ok(sc_transaction_pool::BasicPool::new(config, std::sync::Arc::new(pool_api))) + Ok(sc_transaction_pool::BasicPool::new(config, std::sync::Arc::new(pool_api), prometheus_registry)) })? - .with_import_queue(|_config, client, mut select_chain, _transaction_pool| { + .with_import_queue(|_config, client, mut select_chain, _transaction_pool, spawn_task_handle| { let select_chain = select_chain.take() .ok_or_else(|| sc_service::Error::SelectChainRequired)?; @@ -50,13 +52,14 @@ macro_rules! new_full_start { grandpa_block_import.clone(), client.clone(), ); - let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair>( + let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _>( sc_consensus_aura::slot_duration(&*client)?, aura_block_import, Some(Box::new(grandpa_block_import.clone())), None, client, inherent_data_providers.clone(), + spawn_task_handle, )?; import_setup = Some((grandpa_block_import, grandpa_link)); @@ -153,7 +156,8 @@ pub fn new_full(config: Configuration) inherent_data_providers: inherent_data_providers.clone(), telemetry_on_connect: Some(service.telemetry_on_connect_stream()), voting_rule: sc_finality_grandpa::VotingRulesBuilder::default().build(), - prometheus_registry: service.prometheus_registry() + prometheus_registry: service.prometheus_registry(), + shared_voter_state: SharedVoterState::empty() }; // the GRANDPA voter task is considered infallible, i.e. @@ -183,17 +187,17 @@ pub fn new_light(config: Configuration) .with_select_chain(|_config, backend| { Ok(LongestChain::new(backend.clone())) })? - .with_transaction_pool(|config, client, fetcher| { + .with_transaction_pool(|config, client, fetcher, prometheus_registry| { let fetcher = fetcher .ok_or_else(|| "Trying to start light transaction pool without active fetcher")?; let pool_api = sc_transaction_pool::LightChainApi::new(client.clone(), fetcher.clone()); let pool = sc_transaction_pool::BasicPool::with_revalidation_type( - config, Arc::new(pool_api), sc_transaction_pool::RevalidationType::Light, + config, Arc::new(pool_api), prometheus_registry, sc_transaction_pool::RevalidationType::Light, ); Ok(pool) })? - .with_import_queue_and_fprb(|_config, client, backend, fetcher, _select_chain, _tx_pool| { + .with_import_queue_and_fprb(|_config, client, backend, fetcher, _select_chain, _tx_pool, spawn_task_handle| { let fetch_checker = fetcher .map(|fetcher| fetcher.checker().clone()) .ok_or_else(|| "Trying to start light import queue without active fetch checker")?; @@ -207,13 +211,14 @@ pub fn new_light(config: Configuration) let finality_proof_request_builder = finality_proof_import.create_finality_proof_request_builder(); - let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair>( + let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _>( sc_consensus_aura::slot_duration(&*client)?, grandpa_block_import, None, Some(Box::new(finality_proof_import)), client, inherent_data_providers.clone(), + spawn_task_handle, )?; Ok((import_queue, finality_proof_request_builder)) diff --git a/pallets/template/Cargo.toml b/pallets/template/Cargo.toml index b508092..9620837 100644 --- a/pallets/template/Cargo.toml +++ b/pallets/template/Cargo.toml @@ -6,7 +6,7 @@ homepage = 'https://substrate.dev' license = 'Unlicense' name = 'pallet-template' repository = 'https://github.com/paritytech/substrate/' -version = '2.0.0-alpha.6' +version = '2.0.0-alpha.7' [package.metadata.docs.rs] targets = ['x86_64-unknown-linux-gnu'] @@ -20,27 +20,27 @@ version = '1.3.0' [dependencies.frame-support] git = 'https://github.com/paritytech/substrate.git' default-features = false -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.frame-system] git = 'https://github.com/paritytech/substrate.git' default-features = false -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dev-dependencies.sp-core] git = 'https://github.com/paritytech/substrate.git' default-features = false -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dev-dependencies.sp-io] git = 'https://github.com/paritytech/substrate.git' default-features = false -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dev-dependencies.sp-runtime] git = 'https://github.com/paritytech/substrate.git' default-features = false -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [features] default = ['std'] diff --git a/pallets/template/src/lib.rs b/pallets/template/src/lib.rs index a0daecf..afe9521 100644 --- a/pallets/template/src/lib.rs +++ b/pallets/template/src/lib.rs @@ -75,7 +75,7 @@ decl_module! { /// Just a dummy entry point. /// function that can be called by the external world as an extrinsics call /// takes a parameter of the type `AccountId`, stores it, and emits an event - #[weight = frame_support::weights::SimpleDispatchInfo::default()] + #[weight = 10_000] pub fn do_something(origin, something: u32) -> dispatch::DispatchResult { // Check it was signed and get the signer. See also: ensure_root and ensure_none let who = ensure_signed(origin)?; @@ -91,7 +91,7 @@ decl_module! { /// Another dummy entry point. /// takes no parameters, attempts to increment storage value, and possibly throws an error - #[weight = frame_support::weights::SimpleDispatchInfo::default()] + #[weight = 10_000] pub fn cause_error(origin) -> dispatch::DispatchResult { // Check it was signed and get the signer. See also: ensure_root and ensure_none let _who = ensure_signed(origin)?; diff --git a/pallets/template/src/mock.rs b/pallets/template/src/mock.rs index a93ac03..f587da3 100644 --- a/pallets/template/src/mock.rs +++ b/pallets/template/src/mock.rs @@ -38,6 +38,9 @@ impl system::Trait for Test { type MaximumBlockWeight = MaximumBlockWeight; type MaximumBlockLength = MaximumBlockLength; type AvailableBlockRatio = AvailableBlockRatio; + type BlockExecutionWeight = (); + type DbWeight = (); + type ExtrinsicBaseWeight = (); type Version = (); type ModuleToIndex = (); type AccountData = (); diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 2bd2eff..8239ef0 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -2,13 +2,13 @@ git = 'https://github.com/paritytech/substrate.git' default-features = false package = 'pallet-aura' -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.balances] git = 'https://github.com/paritytech/substrate.git' default-features = false package = 'pallet-balances' -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.codec] default-features = false @@ -19,24 +19,24 @@ version = '1.3.0' [dependencies.frame-executive] git = 'https://github.com/paritytech/substrate.git' default-features = false -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.frame-support] git = 'https://github.com/paritytech/substrate.git' default-features = false -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.grandpa] git = 'https://github.com/paritytech/substrate.git' default-features = false package = 'pallet-grandpa' -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.randomness-collective-flip] git = 'https://github.com/paritytech/substrate.git' default-features = false package = 'pallet-randomness-collective-flip' -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.serde] features = ['derive'] @@ -46,93 +46,93 @@ version = '1.0.101' [dependencies.sp-api] git = 'https://github.com/paritytech/substrate.git' default-features = false -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.sp-block-builder] git = 'https://github.com/paritytech/substrate.git' default-features = false -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.sp-consensus-aura] git = 'https://github.com/paritytech/substrate.git' default-features = false -version = '0.8.0-alpha.6' -tag = 'v2.0.0-alpha.6' +version = '0.8.0-alpha.7' +tag = 'v2.0.0-alpha.7' [dependencies.sp-core] git = 'https://github.com/paritytech/substrate.git' default-features = false -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.sp-inherents] git = 'https://github.com/paritytech/substrate.git' default-features = false -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.sp-io] git = 'https://github.com/paritytech/substrate.git' default-features = false -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.sp-offchain] git = 'https://github.com/paritytech/substrate.git' default-features = false -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.sp-runtime] git = 'https://github.com/paritytech/substrate.git' default-features = false -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.sp-session] git = 'https://github.com/paritytech/substrate.git' default-features = false -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.sp-std] git = 'https://github.com/paritytech/substrate.git' default-features = false -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.sp-transaction-pool] git = 'https://github.com/paritytech/substrate.git' default-features = false -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.sp-version] git = 'https://github.com/paritytech/substrate.git' default-features = false -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.sudo] git = 'https://github.com/paritytech/substrate.git' default-features = false package = 'pallet-sudo' -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.system] git = 'https://github.com/paritytech/substrate.git' default-features = false package = 'frame-system' -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.template] default-features = false package = 'pallet-template' path = '../pallets/template' -version = '2.0.0-alpha.6' +version = '2.0.0-alpha.7' [dependencies.timestamp] git = 'https://github.com/paritytech/substrate.git' default-features = false package = 'pallet-timestamp' -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [dependencies.transaction-payment] git = 'https://github.com/paritytech/substrate.git' default-features = false package = 'pallet-transaction-payment' -tag = 'v2.0.0-alpha.6' +tag = 'v2.0.0-alpha.7' [build-dependencies.wasm-builder-runner] git = 'https://github.com/paritytech/substrate.git' @@ -146,7 +146,7 @@ homepage = 'https://substrate.dev' license = 'Unlicense' name = 'node-template-runtime' repository = 'https://github.com/paritytech/substrate/' -version = '2.0.0-alpha.6' +version = '2.0.0-alpha.7' [package.metadata.docs.rs] targets = ['x86_64-unknown-linux-gnu'] diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 94f033f..0deb35c 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -34,7 +34,10 @@ pub use sp_runtime::{Permill, Perbill}; pub use frame_support::{ StorageValue, construct_runtime, parameter_types, traits::Randomness, - weights::Weight, + weights::{ + Weight, + constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, + }, }; /// Importing a template pallet @@ -97,6 +100,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { authoring_version: 1, spec_version: 1, impl_version: 1, + transaction_version: 1, apis: RUNTIME_API_VERSIONS, }; @@ -120,7 +124,8 @@ pub fn native_version() -> NativeVersion { parameter_types! { pub const BlockHashCount: BlockNumber = 250; - pub const MaximumBlockWeight: Weight = 1_000_000_000; + /// We allow for 2 seconds of compute with a 6 second average block time. + pub const MaximumBlockWeight: Weight = 2 * WEIGHT_PER_SECOND; pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); pub const MaximumBlockLength: u32 = 5 * 1024 * 1024; pub const Version: RuntimeVersion = VERSION; @@ -155,6 +160,14 @@ impl system::Trait for Runtime { type MaximumBlockLength = MaximumBlockLength; /// Portion of the block weight that is available to all normal transactions. type AvailableBlockRatio = AvailableBlockRatio; + /// The weight of the overhead invoked on the block import process, independent of the + /// extrinsics included in that block. + type BlockExecutionWeight = BlockExecutionWeight; + /// The weight of database operations that the runtime can invoke. + type DbWeight = RocksDbWeight; + /// The base weight of any extrinsic processed by the runtime, independent of the + /// logic of that extrinsic. (Signature verification, nonce increment, fee, etc...) + type ExtrinsicBaseWeight = ExtrinsicBaseWeight; /// Version of the runtime. type Version = Version; /// Converts a module to the index of the module in `construct_runtime!`. @@ -203,14 +216,12 @@ impl balances::Trait for Runtime { } parameter_types! { - pub const TransactionBaseFee: Balance = 0; pub const TransactionByteFee: Balance = 1; } impl transaction_payment::Trait for Runtime { type Currency = balances::Module; type OnTransactionPayment = (); - type TransactionBaseFee = TransactionBaseFee; type TransactionByteFee = TransactionByteFee; type WeightToFee = ConvertInto; type FeeMultiplierUpdate = ();