From 5d3a268c59b907dc8ffff468e6094e16b06c5661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 4 Feb 2021 11:36:50 +0100 Subject: [PATCH 01/25] Update branch --- cli/Cargo.toml | 14 +-- core-primitives/Cargo.toml | 6 +- erasure-coding/Cargo.toml | 4 +- node/collation-generation/Cargo.toml | 2 +- node/core/approval-voting/Cargo.toml | 8 +- node/core/av-store/Cargo.toml | 6 +- node/core/backing/Cargo.toml | 10 +- node/core/bitfield-signing/Cargo.toml | 2 +- node/core/candidate-selection/Cargo.toml | 4 +- node/core/candidate-validation/Cargo.toml | 4 +- node/core/chain-api/Cargo.toml | 4 +- node/core/proposer/Cargo.toml | 22 ++-- node/core/provisioner/Cargo.toml | 4 +- node/core/runtime-api/Cargo.toml | 6 +- node/jaeger/Cargo.toml | 4 +- node/network/approval-distribution/Cargo.toml | 2 +- .../availability-distribution/Cargo.toml | 14 +-- node/network/availability-recovery/Cargo.toml | 6 +- node/network/bitfield-distribution/Cargo.toml | 6 +- node/network/bridge/Cargo.toml | 8 +- node/network/collator-protocol/Cargo.toml | 4 +- node/network/pov-distribution/Cargo.toml | 4 +- node/network/protocol/Cargo.toml | 2 +- .../network/statement-distribution/Cargo.toml | 12 +- node/overseer/Cargo.toml | 4 +- node/primitives/Cargo.toml | 8 +- node/service/Cargo.toml | 80 ++++++------- node/subsystem-test-helpers/Cargo.toml | 4 +- node/subsystem-util/Cargo.toml | 10 +- node/subsystem/Cargo.toml | 6 +- node/test/client/Cargo.toml | 26 ++--- node/test/service/Cargo.toml | 62 +++++----- parachain/Cargo.toml | 14 +-- parachain/test-parachains/Cargo.toml | 2 +- parachain/test-parachains/adder/Cargo.toml | 4 +- .../test-parachains/adder/collator/Cargo.toml | 14 +-- primitives/Cargo.toml | 30 ++--- rpc/Cargo.toml | 40 +++---- runtime/common/Cargo.toml | 54 ++++----- runtime/kusama/Cargo.toml | 110 +++++++++--------- runtime/parachains/Cargo.toml | 58 ++++----- runtime/polkadot/Cargo.toml | 106 ++++++++--------- runtime/rococo/Cargo.toml | 66 +++++------ runtime/test-runtime/Cargo.toml | 74 ++++++------ runtime/westend/Cargo.toml | 108 ++++++++--------- statement-table/Cargo.toml | 2 +- xcm/xcm-builder/Cargo.toml | 10 +- xcm/xcm-executor/Cargo.toml | 12 +- 48 files changed, 531 insertions(+), 531 deletions(-) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 4e29c3dc8538..b9667a2d865a 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -24,19 +24,19 @@ futures = "0.3.12" service = { package = "polkadot-service", path = "../node/service", default-features = false, optional = true } polkadot-parachain = { path = "../parachain", optional = true } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } tracing-futures = "0.2.4" -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } -browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", branch = "master", optional = true } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", optional = true , branch = "bkchr-inherent-something-future" } +sc-cli = { git = "https://github.com/paritytech/substrate", optional = true , branch = "bkchr-inherent-something-future" } +sc-service = { git = "https://github.com/paritytech/substrate", optional = true , branch = "bkchr-inherent-something-future" } +browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", optional = true , branch = "bkchr-inherent-something-future" } # this crate is used only to enable `trie-memory-tracker` feature # see https://github.com/paritytech/substrate/pull/6745 -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } [features] default = [ "wasmtime", "db", "cli", "full-node", "trie-memory-tracker", "polkadot-parachain" ] diff --git a/core-primitives/Cargo.toml b/core-primitives/Cargo.toml index 4007c9a90037..3f8a660c1ed8 100644 --- a/core-primitives/Cargo.toml +++ b/core-primitives/Cargo.toml @@ -5,9 +5,9 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } parity-scale-codec = { version = "2.0.0", default-features = false, features = [ "derive" ] } parity-util-mem = { version = "0.9.0", default-features = false, optional = true } diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml index 752b2057d771..501212fd0a7a 100644 --- a/erasure-coding/Cargo.toml +++ b/erasure-coding/Cargo.toml @@ -8,6 +8,6 @@ edition = "2018" primitives = { package = "polkadot-primitives", path = "../primitives" } reed_solomon = { package = "reed-solomon-erasure", version = "4.0.2" } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } thiserror = "1.0.23" diff --git a/node/collation-generation/Cargo.toml b/node/collation-generation/Cargo.toml index 1a009b7a1333..3e281e55ab56 100644 --- a/node/collation-generation/Cargo.toml +++ b/node/collation-generation/Cargo.toml @@ -13,7 +13,7 @@ polkadot-node-primitives = { path = "../primitives" } polkadot-node-subsystem = { path = "../subsystem" } polkadot-node-subsystem-util = { path = "../subsystem-util" } polkadot-primitives = { path = "../../primitives" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } thiserror = "1.0.23" [dev-dependencies] diff --git a/node/core/approval-voting/Cargo.toml b/node/core/approval-voting/Cargo.toml index 4054eea4ce09..0996ab5e439a 100644 --- a/node/core/approval-voting/Cargo.toml +++ b/node/core/approval-voting/Cargo.toml @@ -14,8 +14,8 @@ polkadot-primitives = { path = "../../../primitives" } polkadot-node-primitives = { path = "../../primitives" } bitvec = "0.20.1" -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sc-client-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-consensus-slots = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } -[dev-dependencies] \ No newline at end of file +[dev-dependencies] diff --git a/node/core/av-store/Cargo.toml b/node/core/av-store/Cargo.toml index 0a2d6f9be86d..d124346f8dd5 100644 --- a/node/core/av-store/Cargo.toml +++ b/node/core/av-store/Cargo.toml @@ -21,7 +21,7 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-overseer = { path = "../../overseer" } polkadot-primitives = { path = "../../../primitives" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sc-service = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } [dev-dependencies] log = "0.4.13" @@ -29,8 +29,8 @@ env_logger = "0.8.2" assert_matches = "1.4.0" kvdb-memorydb = "0.9.0" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } parking_lot = "0.11.1" diff --git a/node/core/backing/Cargo.toml b/node/core/backing/Cargo.toml index faaa7285341e..4fa1601b69a5 100644 --- a/node/core/backing/Cargo.toml +++ b/node/core/backing/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] futures = "0.3.12" -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } polkadot-primitives = { path = "../../../primitives" } polkadot-node-primitives = { path = "../../primitives" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } @@ -19,10 +19,10 @@ tracing-futures = "0.2.4" thiserror = "1.0.23" [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } futures = { version = "0.3.12", features = ["thread-pool"] } assert_matches = "1.4.0" polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } diff --git a/node/core/bitfield-signing/Cargo.toml b/node/core/bitfield-signing/Cargo.toml index 813c3a123a30..6c95f24391fb 100644 --- a/node/core/bitfield-signing/Cargo.toml +++ b/node/core/bitfield-signing/Cargo.toml @@ -11,6 +11,6 @@ tracing-futures = "0.2.4" polkadot-primitives = { path = "../../../primitives" } polkadot-node-subsystem = { path = "../../subsystem" } polkadot-node-subsystem-util = { path = "../../subsystem-util" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } wasm-timer = "0.2.5" thiserror = "1.0.23" diff --git a/node/core/candidate-selection/Cargo.toml b/node/core/candidate-selection/Cargo.toml index c85a0cef3caf..acfb610ff59c 100644 --- a/node/core/candidate-selection/Cargo.toml +++ b/node/core/candidate-selection/Cargo.toml @@ -10,11 +10,11 @@ tracing = "0.1.22" tracing-futures = "0.2.4" thiserror = "1.0.23" -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } polkadot-primitives = { path = "../../../primitives" } polkadot-node-subsystem = { path = "../../subsystem" } polkadot-node-subsystem-util = { path = "../../subsystem-util" } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } diff --git a/node/core/candidate-validation/Cargo.toml b/node/core/candidate-validation/Cargo.toml index ed3d6794ca24..1d920d83fffd 100644 --- a/node/core/candidate-validation/Cargo.toml +++ b/node/core/candidate-validation/Cargo.toml @@ -9,7 +9,7 @@ futures = "0.3.12" tracing = "0.1.22" tracing-futures = "0.2.4" -sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["bit-vec", "derive"] } polkadot-primitives = { path = "../../../primitives" } @@ -19,7 +19,7 @@ polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsys polkadot-node-subsystem-util = { path = "../../subsystem-util" } [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } futures = { version = "0.3.12", features = ["thread-pool"] } assert_matches = "1.4.0" polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } diff --git a/node/core/chain-api/Cargo.toml b/node/core/chain-api/Cargo.toml index cc00e064c5b6..403c8562107e 100644 --- a/node/core/chain-api/Cargo.toml +++ b/node/core/chain-api/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" futures = "0.3.12" tracing = "0.1.22" tracing-futures = "0.2.4" -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } polkadot-primitives = { path = "../../../primitives" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } polkadot-node-subsystem-util = { path = "../../subsystem-util" } @@ -17,4 +17,4 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" } futures = { version = "0.3.12", features = ["thread-pool"] } maplit = "1.0.2" polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } diff --git a/node/core/proposer/Cargo.toml b/node/core/proposer/Cargo.toml index 555cd947ae20..c54269ad3236 100644 --- a/node/core/proposer/Cargo.toml +++ b/node/core/proposer/Cargo.toml @@ -11,14 +11,14 @@ tracing = "0.1.22" polkadot-node-subsystem = { path = "../../subsystem" } polkadot-overseer = { path = "../../overseer" } polkadot-primitives = { path = "../../../primitives" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } diff --git a/node/core/provisioner/Cargo.toml b/node/core/provisioner/Cargo.toml index 249b7afbf915..0535a84d52a0 100644 --- a/node/core/provisioner/Cargo.toml +++ b/node/core/provisioner/Cargo.toml @@ -16,5 +16,5 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" } futures-timer = "3.0.2" [dev-dependencies] -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } diff --git a/node/core/runtime-api/Cargo.toml b/node/core/runtime-api/Cargo.toml index f0302c86cf11..fcb98da846db 100644 --- a/node/core/runtime-api/Cargo.toml +++ b/node/core/runtime-api/Cargo.toml @@ -11,14 +11,14 @@ tracing-futures = "0.2.4" memory-lru = "0.1.0" parity-util-mem = { version = "0.9.0", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } polkadot-primitives = { path = "../../../primitives" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } polkadot-node-subsystem-util = { path = "../../subsystem-util" } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } futures = { version = "0.3.12", features = ["thread-pool"] } polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } diff --git a/node/jaeger/Cargo.toml b/node/jaeger/Cargo.toml index 86b1db3eda2b..982786d9a6c6 100644 --- a/node/jaeger/Cargo.toml +++ b/node/jaeger/Cargo.toml @@ -11,7 +11,7 @@ mick-jaeger = "0.1.4" lazy_static = "1.4" parking_lot = "0.11.1" polkadot-primitives = { path = "../../primitives" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } thiserror = "1.0.23" log = "0.4.13" diff --git a/node/network/approval-distribution/Cargo.toml b/node/network/approval-distribution/Cargo.toml index 26081d34d3f3..2315f318c39f 100644 --- a/node/network/approval-distribution/Cargo.toml +++ b/node/network/approval-distribution/Cargo.toml @@ -16,7 +16,7 @@ tracing = "0.1.22" tracing-futures = "0.2.4" [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] } +sp-core = { git = "https://github.com/paritytech/substrate", features = ["std"] , branch = "bkchr-inherent-something-future" } polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } diff --git a/node/network/availability-distribution/Cargo.toml b/node/network/availability-distribution/Cargo.toml index add6b2c43d33..d64de2ad68f4 100644 --- a/node/network/availability-distribution/Cargo.toml +++ b/node/network/availability-distribution/Cargo.toml @@ -14,16 +14,16 @@ polkadot-erasure-coding = { path = "../../../erasure-coding" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } polkadot-node-network-protocol = { path = "../../network/protocol" } polkadot-node-subsystem-util = { path = "../../subsystem-util" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", features = ["std"] , branch = "bkchr-inherent-something-future" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } thiserror = "1.0.23" [dev-dependencies] polkadot-subsystem-testhelpers = { package = "polkadot-node-subsystem-test-helpers", path = "../../subsystem-test-helpers" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", features = ["std"] , branch = "bkchr-inherent-something-future" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } assert_matches = "1.4.0" maplit = "1.0" diff --git a/node/network/availability-recovery/Cargo.toml b/node/network/availability-recovery/Cargo.toml index a5781891c6df..7d8e42f419fc 100644 --- a/node/network/availability-recovery/Cargo.toml +++ b/node/network/availability-recovery/Cargo.toml @@ -27,8 +27,8 @@ futures-timer = "3.0.2" log = "0.4.11" smallvec = "1.5.1" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } polkadot-subsystem-testhelpers = { package = "polkadot-node-subsystem-test-helpers", path = "../../subsystem-test-helpers" } diff --git a/node/network/bitfield-distribution/Cargo.toml b/node/network/bitfield-distribution/Cargo.toml index 23118782839c..8fb1b4944623 100644 --- a/node/network/bitfield-distribution/Cargo.toml +++ b/node/network/bitfield-distribution/Cargo.toml @@ -17,9 +17,9 @@ polkadot-node-network-protocol = { path = "../../network/protocol" } [dev-dependencies] polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } maplit = "1.0.2" log = "0.4.13" env_logger = "0.8.2" diff --git a/node/network/bridge/Cargo.toml b/node/network/bridge/Cargo.toml index dfb7e3afc593..a06a7998658f 100644 --- a/node/network/bridge/Cargo.toml +++ b/node/network/bridge/Cargo.toml @@ -11,8 +11,8 @@ tracing = "0.1.22" tracing-futures = "0.2.4" polkadot-primitives = { path = "../../../primitives" } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] } -sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } polkadot-node-network-protocol = { path = "../protocol" } strum = "0.20.0" @@ -22,5 +22,5 @@ assert_matches = "1.4.0" parking_lot = "0.11.1" polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } polkadot-node-subsystem-util = { path = "../../subsystem-util"} -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } diff --git a/node/network/collator-protocol/Cargo.toml b/node/network/collator-protocol/Cargo.toml index f392924e96a7..20c62e62c614 100644 --- a/node/network/collator-protocol/Cargo.toml +++ b/node/network/collator-protocol/Cargo.toml @@ -22,7 +22,7 @@ env_logger = "0.8.2" assert_matches = "1.4.0" futures-timer = "3.0.2" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", features = ["std"] , branch = "bkchr-inherent-something-future" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } polkadot-subsystem-testhelpers = { package = "polkadot-node-subsystem-test-helpers", path = "../../subsystem-test-helpers" } diff --git a/node/network/pov-distribution/Cargo.toml b/node/network/pov-distribution/Cargo.toml index 33692a1411aa..aeca313fb788 100644 --- a/node/network/pov-distribution/Cargo.toml +++ b/node/network/pov-distribution/Cargo.toml @@ -20,7 +20,7 @@ assert_matches = "1.4.0" env_logger = "0.8.1" log = "0.4.13" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } diff --git a/node/network/protocol/Cargo.toml b/node/network/protocol/Cargo.toml index 6c56cbc29858..6b2ae5f36d53 100644 --- a/node/network/protocol/Cargo.toml +++ b/node/network/protocol/Cargo.toml @@ -10,7 +10,7 @@ polkadot-primitives = { path = "../../../primitives" } polkadot-node-primitives = { path = "../../primitives" } polkadot-node-jaeger = { path = "../../jaeger" } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } strum = { version = "0.20", features = ["derive"] } thiserror = "1.0.23" futures = "0.3.12" diff --git a/node/network/statement-distribution/Cargo.toml b/node/network/statement-distribution/Cargo.toml index 53343ace4e3d..0f2dfd3ed4be 100644 --- a/node/network/statement-distribution/Cargo.toml +++ b/node/network/statement-distribution/Cargo.toml @@ -11,7 +11,7 @@ tracing = "0.1.22" tracing-futures = "0.2.4" polkadot-primitives = { path = "../../../primitives" } node-primitives = { package = "polkadot-node-primitives", path = "../../primitives" } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-node-network-protocol = { path = "../../network/protocol" } @@ -21,8 +21,8 @@ indexmap = "1.6.1" [dev-dependencies] polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } assert_matches = "1.4.0" -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } diff --git a/node/overseer/Cargo.toml b/node/overseer/Cargo.toml index 07b5c87dad25..b60eea86c65e 100644 --- a/node/overseer/Cargo.toml +++ b/node/overseer/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] async-trait = "0.1.42" -client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" } +client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } futures = "0.3.12" futures-timer = "3.0.2" oorandom = "11.1.3" @@ -18,7 +18,7 @@ tracing = "0.1.22" tracing-futures = "0.2.4" [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } polkadot-node-network-protocol = { path = "../network/protocol" } futures = { version = "0.3.12", features = ["thread-pool"] } futures-timer = "3.0.2" diff --git a/node/primitives/Cargo.toml b/node/primitives/Cargo.toml index 58777d95526a..e3ca73c876d4 100644 --- a/node/primitives/Cargo.toml +++ b/node/primitives/Cargo.toml @@ -10,7 +10,7 @@ futures = "0.3.12" polkadot-primitives = { path = "../../primitives" } polkadot-statement-table = { path = "../../statement-table" } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-consensus-vrf = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-consensus-vrf = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-consensus-slots = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index a32e25a945e8..9b4414349102 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -6,52 +6,52 @@ edition = "2018" [dependencies] # Substrate Client -sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" } -babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-finality-grandpa-warp-sync = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "master" } +sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-finality-grandpa-warp-sync = { git = "https://github.com/paritytech/substrate", optional = true , branch = "bkchr-inherent-something-future" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +service = { package = "sc-service", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } # Substrate Primitives -sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } -grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } # Substrate Pallets -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } # Substrate Other -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } # External Crates futures = "0.3.12" diff --git a/node/subsystem-test-helpers/Cargo.toml b/node/subsystem-test-helpers/Cargo.toml index 6387e99d0a8e..a9df53e44e0b 100644 --- a/node/subsystem-test-helpers/Cargo.toml +++ b/node/subsystem-test-helpers/Cargo.toml @@ -19,9 +19,9 @@ polkadot-node-subsystem = { path = "../subsystem" } polkadot-node-subsystem-util = { path = "../subsystem-util" } polkadot-primitives = { path = "../../primitives" } polkadot-statement-table = { path = "../../statement-table" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } smallvec = "1.6.1" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } [dev-dependencies] polkadot-overseer = { path = "../overseer" } diff --git a/node/subsystem-util/Cargo.toml b/node/subsystem-util/Cargo.toml index 4b165bdf6d2c..ba81fe09bcd9 100644 --- a/node/subsystem-util/Cargo.toml +++ b/node/subsystem-util/Cargo.toml @@ -23,11 +23,11 @@ polkadot-node-jaeger = { path = "../jaeger" } polkadot-primitives = { path = "../../primitives" } metered-channel = { path = "../metered-channel"} -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } [dev-dependencies] assert_matches = "1.4.0" diff --git a/node/subsystem/Cargo.toml b/node/subsystem/Cargo.toml index 3fa2061f0491..2b5989924b78 100644 --- a/node/subsystem/Cargo.toml +++ b/node/subsystem/Cargo.toml @@ -23,10 +23,10 @@ polkadot-node-network-protocol = { path = "../network/protocol" } polkadot-primitives = { path = "../../primitives" } polkadot-statement-table = { path = "../../statement-table" } polkadot-node-jaeger = { path = "../jaeger" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } smallvec = "1.6.1" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } thiserror = "1.0.23" log = "0.4.13" diff --git a/node/test/client/Cargo.toml b/node/test/client/Cargo.toml index 287c058c62a8..8f881df505b6 100644 --- a/node/test/client/Cargo.toml +++ b/node/test/client/Cargo.toml @@ -14,18 +14,18 @@ polkadot-primitives = { path = "../../../primitives" } polkadot-node-subsystem = { path = "../../subsystem" } # Substrate dependencies -substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } diff --git a/node/test/service/Cargo.toml b/node/test/service/Cargo.toml index c22920ca40f7..95db6d899605 100644 --- a/node/test/service/Cargo.toml +++ b/node/test/service/Cargo.toml @@ -26,38 +26,38 @@ polkadot-test-runtime = { path = "../../../runtime/test-runtime" } polkadot-runtime-parachains = { path = "../../../runtime/parachains" } # Substrate dependencies -sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" } -babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" } -grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } -substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +service = { package = "sc-service", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } [dev-dependencies] -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } serde_json = "1.0.61" -substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } +substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } tokio = { version = "0.2", features = ["macros"] } diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml index 232d2d322a37..fa9f59f78d1a 100644 --- a/parachain/Cargo.toml +++ b/parachain/Cargo.toml @@ -11,19 +11,19 @@ edition = "2018" # various unnecessary Substrate-specific endpoints. parity-scale-codec = { version = "2.0.0", default-features = false, features = [ "derive" ] } parity-util-mem = { version = "0.9.0", optional = true } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-wasm-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } polkadot-core-primitives = { path = "../core-primitives", default-features = false } derive_more = "0.99.11" # all optional crates. thiserror = { version = "1.0.22", optional = true } serde = { version = "1.0.117", default-features = false, features = [ "derive" ], optional = true } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } +sp-externalities = { git = "https://github.com/paritytech/substrate", optional = true , branch = "bkchr-inherent-something-future" } +sc-executor = { git = "https://github.com/paritytech/substrate", optional = true , branch = "bkchr-inherent-something-future" } +sp-io = { git = "https://github.com/paritytech/substrate", optional = true , branch = "bkchr-inherent-something-future" } parking_lot = { version = "0.11.1", optional = true } log = { version = "0.4.11", optional = true } futures = { version = "0.3.8", optional = true } diff --git a/parachain/test-parachains/Cargo.toml b/parachain/test-parachains/Cargo.toml index 75069345e2d7..cea01a6e137b 100644 --- a/parachain/test-parachains/Cargo.toml +++ b/parachain/test-parachains/Cargo.toml @@ -14,7 +14,7 @@ adder = { package = "test-parachain-adder", path = "adder" } halt = { package = "test-parachain-halt", path = "halt" } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } [features] default = [ "std" ] diff --git a/parachain/test-parachains/adder/Cargo.toml b/parachain/test-parachains/adder/Cargo.toml index c631d188ec6b..ce7f165d7497 100644 --- a/parachain/test-parachains/adder/Cargo.toml +++ b/parachain/test-parachains/adder/Cargo.toml @@ -9,12 +9,12 @@ build = "build.rs" [dependencies] parachain = { package = "polkadot-parachain", path = "../../", default-features = false, features = [ "wasm-api" ] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } tiny-keccak = { version = "2.0.2", features = ["keccak"] } dlmalloc = { version = "0.2.1", features = [ "global" ] } # We need to make sure the global allocator is disabled until we have support of full substrate externalities -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = [ "disable_allocator" ] } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, features = [ "disable_allocator" ] , branch = "bkchr-inherent-something-future" } [build-dependencies] substrate-wasm-builder = "3.0.0" diff --git a/parachain/test-parachains/adder/collator/Cargo.toml b/parachain/test-parachains/adder/collator/Cargo.toml index 4068d3c3f9e9..f229bc720fb2 100644 --- a/parachain/test-parachains/adder/collator/Cargo.toml +++ b/parachain/test-parachains/adder/collator/Cargo.toml @@ -23,18 +23,18 @@ polkadot-service = { path = "../../../../node/service" } polkadot-node-primitives = { path = "../../../../node/primitives" } polkadot-node-subsystem = { path = "../../../../node/subsystem" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } [dev-dependencies] polkadot-parachain = { path = "../../.." } polkadot-test-service = { path = "../../../../node/test/service" } -substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } tokio = { version = "0.2", features = ["macros"] } diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 98d1684f3df0..b4606ef83774 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -7,28 +7,28 @@ edition = "2018" [dependencies] serde = { version = "1.0.123", optional = true, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["bit-vec", "derive"] } -primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-keystore = { git = "https://github.com/paritytech/substrate", optional = true , branch = "bkchr-inherent-something-future" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } polkadot-parachain = { path = "../parachain", default-features = false } polkadot-core-primitives = { path = "../core-primitives", default-features = false } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } hex-literal = "0.3.1" parity-util-mem = { version = "0.9.0", default-features = false, optional = true } [dev-dependencies] -sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } pretty_assertions = "0.6.1" [features] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 7a2179cc9725..41b0f53a62a1 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -7,24 +7,24 @@ edition = "2018" [dependencies] jsonrpc-core = "15.1.0" polkadot-primitives = { path = "../primitives" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master"} -sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "master"} -sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "master"} -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master"} -sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "master"} -txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master" } -frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } parity-scale-codec = { version = "2.0.0", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 50d61a2099b1..434ba4a9bf4a 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -13,27 +13,27 @@ serde = { version = "1.0.123", default-features = false } serde_derive = { version = "1.0.117", optional = true } static_assertions = "1.1.0" -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-system = {git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "bkchr-inherent-something-future" } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } libsecp256k1 = { version = "0.3.5", default-features = false, optional = true } @@ -43,13 +43,13 @@ xcm = { path = "../../xcm", default-features = false } [dev-dependencies] hex-literal = "0.3.1" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } trie-db = "0.22.2" serde_json = "1.0.61" libsecp256k1 = "0.3.5" diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index dcfb9471a6c1..25f140365ac0 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -15,61 +15,61 @@ serde_derive = { version = "1.0.117", optional = true } static_assertions = "1.1.0" smallvec = "1.6.1" -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } -pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-nicks = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-society = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "master" } -frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-bounties = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-identity = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-im-online = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-indices = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-nicks = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-recovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-society = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +frame-system = {git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-tips = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } -pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } -pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "bkchr-inherent-something-future" } +pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "bkchr-inherent-something-future" } +pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "bkchr-inherent-something-future" } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "bkchr-inherent-something-future" } hex-literal = { version = "0.3.1", optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } @@ -79,8 +79,8 @@ primitives = { package = "polkadot-primitives", path = "../../primitives", defau hex-literal = "0.3.1" libsecp256k1 = "0.3.5" tiny-keccak = "2.0.2" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } separator = "0.4.1" serde_json = "1.0.61" diff --git a/runtime/parachains/Cargo.toml b/runtime/parachains/Cargo.toml index a830546777ff..bbdc5e23491c 100644 --- a/runtime/parachains/Cargo.toml +++ b/runtime/parachains/Cargo.toml @@ -12,27 +12,27 @@ rustc-hex = { version = "2.1.0", default-features = false } serde = { version = "1.0.123", features = [ "derive" ], optional = true } derive_more = "0.99.11" -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-keystore = { git = "https://github.com/paritytech/substrate", optional = true , branch = "bkchr-inherent-something-future" } -pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-system = {git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "bkchr-inherent-something-future" } xcm = { package = "xcm", path = "../../xcm", default-features = false } xcm-executor = { package = "xcm-executor", path = "../../xcm/xcm-executor", default-features = false } @@ -45,17 +45,17 @@ rand_chacha = { version = "0.3.0", default-features = false } [dev-dependencies] futures = "0.3.12" hex-literal = "0.3.1" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } serde_json = "1.0.61" libsecp256k1 = "0.3.5" -sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master"} +sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } [features] diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml index e95c94b3f443..47744bcce9f2 100644 --- a/runtime/polkadot/Cargo.toml +++ b/runtime/polkadot/Cargo.toml @@ -15,59 +15,59 @@ serde_derive = { version = "1.0.117", optional = true } static_assertions = "1.1.0" smallvec = "1.6.1" -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } -pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-nicks = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } -frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-bounties = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-identity = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-im-online = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-indices = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-nicks = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +frame-system = {git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-tips = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } -pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } -pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "bkchr-inherent-something-future" } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "bkchr-inherent-something-future" } +pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "bkchr-inherent-something-future" } +pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "bkchr-inherent-something-future" } hex-literal = { version = "0.3.1", optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } @@ -77,8 +77,8 @@ primitives = { package = "polkadot-primitives", path = "../../primitives", defau hex-literal = "0.3.1" libsecp256k1 = "0.3.5" tiny-keccak = "2.0.2" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } trie-db = "0.22.2" serde_json = "1.0.61" diff --git a/runtime/rococo/Cargo.toml b/runtime/rococo/Cargo.toml index e99567539d2d..b35e6314ebfd 100644 --- a/runtime/rococo/Cargo.toml +++ b/runtime/rococo/Cargo.toml @@ -12,42 +12,42 @@ serde_derive = { version = "1.0.117", optional = true } smallvec = "1.6.1" hex-literal = "0.3.1" -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } -pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "master" } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-im-online = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-indices = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } -frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-system = {git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } diff --git a/runtime/test-runtime/Cargo.toml b/runtime/test-runtime/Cargo.toml index ceb9a1f88520..986052b937b7 100644 --- a/runtime/test-runtime/Cargo.toml +++ b/runtime/test-runtime/Cargo.toml @@ -14,42 +14,42 @@ serde = { version = "1.0.123", default-features = false } serde_derive = { version = "1.0.117", optional = true } smallvec = "1.6.1" -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } -pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-nicks = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } -frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-indices = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-nicks = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +frame-system = {git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -60,8 +60,8 @@ polkadot-runtime-parachains = { path = "../parachains", default-features = false hex-literal = "0.3.1" libsecp256k1 = "0.3.5" tiny-keccak = "2.0.2" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } serde_json = "1.0.61" [build-dependencies] diff --git a/runtime/westend/Cargo.toml b/runtime/westend/Cargo.toml index 95ae99637413..1c057735ea14 100644 --- a/runtime/westend/Cargo.toml +++ b/runtime/westend/Cargo.toml @@ -15,60 +15,60 @@ serde_derive = { version = "1.0.117", optional = true } smallvec = "1.6.1" static_assertions = "1.1.0" -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } -pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-nicks = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-society = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-identity = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-im-online = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-indices = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-nicks = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-recovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-society = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-system = {git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } -pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } -pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "bkchr-inherent-something-future" } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "bkchr-inherent-something-future" } +pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "bkchr-inherent-something-future" } +pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "bkchr-inherent-something-future" } hex-literal = { version = "0.3.1", optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } @@ -79,8 +79,8 @@ polkadot-parachain = { path = "../../parachain", default-features = false } hex-literal = "0.3.1" libsecp256k1 = "0.3.5" tiny-keccak = "2.0.2" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } serde_json = "1.0.61" [build-dependencies] diff --git a/statement-table/Cargo.toml b/statement-table/Cargo.toml index ef7fe7dba14a..88669627a753 100644 --- a/statement-table/Cargo.toml +++ b/statement-table/Cargo.toml @@ -6,5 +6,5 @@ edition = "2018" [dependencies] parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } primitives = { package = "polkadot-primitives", path = "../primitives" } diff --git a/xcm/xcm-builder/Cargo.toml b/xcm/xcm-builder/Cargo.toml index fc57e0f1fc8c..dea42ce740b3 100644 --- a/xcm/xcm-builder/Cargo.toml +++ b/xcm/xcm-builder/Cargo.toml @@ -9,11 +9,11 @@ version = "0.8.22" parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] } xcm = { path = "..", default-features = false } xcm-executor = { path = "../xcm-executor", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } # Polkadot dependencies polkadot-parachain = { path = "../../parachain", default-features = false } diff --git a/xcm/xcm-executor/Cargo.toml b/xcm/xcm-executor/Cargo.toml index bd60b2b67cfe..39516aa5459d 100644 --- a/xcm/xcm-executor/Cargo.toml +++ b/xcm/xcm-executor/Cargo.toml @@ -9,12 +9,12 @@ version = "0.8.22" impl-trait-for-tuples = "0.2.0" parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] } xcm = { path = "..", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } [features] default = ["std"] From 9895c165a07e7105976fa3fec654b922abae5963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 8 Feb 2021 17:33:24 +0100 Subject: [PATCH 02/25] Make it compile --- Cargo.lock | 681 +++++++++++++++++++++------------ Cargo.toml | 199 ++++++++++ node/service/Cargo.toml | 4 +- node/service/src/chain_spec.rs | 2 +- node/service/src/client.rs | 4 +- node/service/src/lib.rs | 75 +++- 6 files changed, 697 insertions(+), 268 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3103a5f322a6..c541d3898d77 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,11 +12,11 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.13.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072" +checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" dependencies = [ - "gimli 0.22.0", + "gimli", ] [[package]] @@ -368,15 +368,15 @@ checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" [[package]] name = "backtrace" -version = "0.3.50" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293" +checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc" dependencies = [ "addr2line", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.20.0", + "object 0.23.0", "rustc-demangle", ] @@ -871,6 +871,16 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" +[[package]] +name = "cpp_demangle" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44919ecaf6f99e8e737bc239408931c9a01e9a6c74814fee8242dd2506b65390" +dependencies = [ + "cfg-if 1.0.0", + "glob", +] + [[package]] name = "cpuid-bool" version = "0.1.0" @@ -879,25 +889,25 @@ checksum = "6d375c433320f6c5057ae04a04376eef4d04ce2801448cf8863a78da99107be4" [[package]] name = "cranelift-bforest" -version = "0.66.0" +version = "0.69.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dcc286b052ee24a1e5a222e7c1125e6010ad35b0f248709b9b3737a8fedcfdf" +checksum = "4066fd63b502d73eb8c5fa6bcab9c7962b05cd580f6b149ee83a8e730d8ce7fb" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.66.0" +version = "0.69.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d9badfe36176cb653506091693bc2bb1970c9bddfcd6ec7fac404f7eaec6f38" +checksum = "1a54e4beb833a3c873a18a8fe735d73d732044004c7539a072c8faa35ccb0c60" dependencies = [ "byteorder", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", - "gimli 0.21.0", + "gimli", "log", "regalloc", "serde", @@ -908,9 +918,9 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.66.0" +version = "0.69.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3f460031861e4f4ad510be62b2ae50bba6cc886b598a36f9c0a970feab9598" +checksum = "c54cac7cacb443658d8f0ff36a3545822613fa202c946c0891897843bc933810" dependencies = [ "cranelift-codegen-shared", "cranelift-entity", @@ -918,24 +928,24 @@ dependencies = [ [[package]] name = "cranelift-codegen-shared" -version = "0.66.0" +version = "0.69.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ad12409e922e7697cd0bdc7dc26992f64a77c31880dfe5e3c7722f4710206d" +checksum = "a109760aff76788b2cdaeefad6875a73c2b450be13906524f6c2a81e05b8d83c" [[package]] name = "cranelift-entity" -version = "0.66.0" +version = "0.69.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97cdc58972ea065d107872cfb9079f4c92ade78a8af85aaff519a65b5d13f71" +checksum = "3b044234aa32531f89a08b487630ddc6744696ec04c8123a1ad388de837f5de3" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.66.0" +version = "0.69.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ef419efb4f94ecc02e5d9fbcc910d2bb7f0040e2de570e63a454f883bc891d6" +checksum = "5452b3e4e97538ee5ef2cc071301c69a86c7adf2770916b9d04e9727096abd93" dependencies = [ "cranelift-codegen", "log", @@ -945,9 +955,9 @@ dependencies = [ [[package]] name = "cranelift-native" -version = "0.66.0" +version = "0.69.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e69d44d59826eef6794066ac2c0f4ad3975f02d97030c60dbc04e3886adf36e" +checksum = "f68035c10b2e80f26cc29c32fa824380877f38483504c2a47b54e7da311caaf3" dependencies = [ "cranelift-codegen", "raw-cpuid", @@ -956,17 +966,19 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.66.0" +version = "0.69.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "979df666b1304624abe99738e9e0e7c7479ee5523ba4b8b237df9ff49996acbb" +checksum = "a530eb9d1c95b3309deb24c3d179d8b0ba5837ed98914a429787c395f614949d" dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", + "itertools", "log", "serde", + "smallvec 1.6.1", "thiserror", - "wasmparser 0.59.0", + "wasmparser", ] [[package]] @@ -1000,7 +1012,7 @@ dependencies = [ "crossbeam-utils 0.7.2", "lazy_static", "maybe-uninit", - "memoffset", + "memoffset 0.5.5", "scopeguard", ] @@ -1182,21 +1194,21 @@ dependencies = [ [[package]] name = "directories" -version = "2.0.2" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c" +checksum = "f8fed639d60b58d0f53498ab13d26f621fd77569cc6edb031f4cc36a2ad9da0f" dependencies = [ - "cfg-if 0.1.10", "dirs-sys", ] [[package]] -name = "directories" -version = "3.0.1" +name = "directories-next" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fed639d60b58d0f53498ab13d26f621fd77569cc6edb031f4cc36a2ad9da0f" +checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" dependencies = [ - "dirs-sys", + "cfg-if 1.0.0", + "dirs-sys-next", ] [[package]] @@ -1206,7 +1218,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" dependencies = [ "libc", - "redox_users", + "redox_users 0.3.4", + "winapi 0.3.9", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users 0.4.0", "winapi 0.3.9", ] @@ -1567,7 +1590,6 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "parity-scale-codec", ] @@ -1585,7 +1607,6 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-support", "frame-system", @@ -1603,7 +1624,6 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "Inflector", "chrono", @@ -1626,7 +1646,6 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-support", "frame-system", @@ -1642,7 +1661,6 @@ dependencies = [ [[package]] name = "frame-metadata" version = "12.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "parity-scale-codec", "serde", @@ -1653,7 +1671,6 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "bitflags", "frame-metadata", @@ -1679,7 +1696,6 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -1691,7 +1707,6 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1703,7 +1718,6 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", @@ -1713,7 +1727,6 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-support", "impl-trait-for-tuples 0.2.0", @@ -1729,7 +1742,6 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-benchmarking", "frame-support", @@ -1743,7 +1755,6 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "parity-scale-codec", "sp-api", @@ -2049,21 +2060,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c" +checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" dependencies = [ "fallible-iterator", "indexmap", "stable_deref_trait", ] -[[package]] -name = "gimli" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724" - [[package]] name = "glob" version = "0.3.0" @@ -3525,6 +3530,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" +dependencies = [ + "autocfg", +] + [[package]] name = "memory-db" version = "0.26.0" @@ -3935,21 +3949,20 @@ dependencies = [ [[package]] name = "object" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cbca9424c482ee628fa549d9c812e2cd22f1180b9222c9200fdfa6eb31aecb2" - -[[package]] -name = "object" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" +checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" dependencies = [ "crc32fast", "indexmap", - "wasmparser 0.57.0", ] +[[package]] +name = "object" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" + [[package]] name = "once_cell" version = "1.4.1" @@ -4019,7 +4032,6 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b" [[package]] name = "pallet-authority-discovery" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-support", "frame-system", @@ -4035,7 +4047,6 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-support", "frame-system", @@ -4050,7 +4061,6 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-benchmarking", "frame-support", @@ -4075,7 +4085,6 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-benchmarking", "frame-support", @@ -4089,7 +4098,6 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-benchmarking", "frame-support", @@ -4104,7 +4112,6 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-benchmarking", "frame-support", @@ -4120,7 +4127,6 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-benchmarking", "frame-support", @@ -4135,7 +4141,6 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-benchmarking", "frame-support", @@ -4150,7 +4155,6 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-benchmarking", "frame-support", @@ -4171,7 +4175,6 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4187,7 +4190,6 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-benchmarking", "frame-support", @@ -4206,7 +4208,6 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-benchmarking", "frame-support", @@ -4223,7 +4224,6 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-support", "frame-system", @@ -4237,7 +4237,6 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-benchmarking", "frame-support", @@ -4253,7 +4252,6 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-support", "frame-system", @@ -4267,7 +4265,6 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-support", "frame-system", @@ -4282,7 +4279,6 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-benchmarking", "frame-support", @@ -4303,7 +4299,6 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-benchmarking", "frame-support", @@ -4319,7 +4314,6 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-support", "frame-system", @@ -4332,7 +4326,6 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "enumflags2", "frame-support", @@ -4347,7 +4340,6 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-benchmarking", "frame-support", @@ -4362,7 +4354,6 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-support", "frame-system", @@ -4382,7 +4373,6 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-benchmarking", "frame-support", @@ -4398,7 +4388,6 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-support", "frame-system", @@ -4412,7 +4401,6 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-benchmarking", "frame-support", @@ -4434,7 +4422,6 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", @@ -4445,7 +4432,6 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-support", "frame-system", @@ -4459,7 +4445,6 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-benchmarking", "frame-support", @@ -4477,7 +4462,6 @@ dependencies = [ [[package]] name = "pallet-tips" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-benchmarking", "frame-support", @@ -4492,7 +4476,6 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-support", "frame-system", @@ -4508,7 +4491,6 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4525,7 +4507,6 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -4536,7 +4517,6 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-benchmarking", "frame-support", @@ -4552,7 +4532,6 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-benchmarking", "frame-support", @@ -4568,7 +4547,6 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5880,6 +5858,7 @@ dependencies = [ "sc-consensus", "sc-consensus-babe", "sc-consensus-slots", + "sc-consensus-uncles", "sc-executor", "sc-finality-grandpa", "sc-finality-grandpa-warp-sync", @@ -5904,6 +5883,7 @@ dependencies = [ "sp-session", "sp-state-machine", "sp-storage", + "sp-timestamp", "sp-transaction-pool", "sp-trie", "substrate-prometheus-endpoint", @@ -6301,6 +6281,15 @@ dependencies = [ "prost", ] +[[package]] +name = "psm" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3abf49e5417290756acfd26501536358560c4a5cc4a0934d390939acb3e7083a" +dependencies = [ + "cc", +] + [[package]] name = "pwasm-utils" version = "0.14.0" @@ -6499,9 +6488,9 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "7.0.3" +version = "8.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a349ca83373cfa5d6dbb66fd76e58b2cca08da71a5f6400de0a0a6a9bceeaf" +checksum = "1fdf7d9dbd43f3d81d94a49c1c3df73cc2b3827995147e6cf7f89d4ec5483e73" dependencies = [ "bitflags", "cc", @@ -6574,6 +6563,16 @@ dependencies = [ "rust-argon2", ] +[[package]] +name = "redox_users" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +dependencies = [ + "getrandom 0.2.1", + "redox_syscall 0.2.4", +] + [[package]] name = "reed-solomon-erasure" version = "4.0.2" @@ -6605,9 +6604,9 @@ dependencies = [ [[package]] name = "regalloc" -version = "0.0.27" +version = "0.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ba8aaf5fe7cf307c6dbdaeed85478961d29e25e3bee5169e11b92fa9f027a8" +checksum = "571f7f397d61c4755285cd37853fe8e03271c243424a907415909379659381c5" dependencies = [ "log", "rustc-hash", @@ -6896,7 +6895,6 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "async-trait", "derive_more", @@ -6924,7 +6922,6 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -6947,7 +6944,6 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6964,7 +6960,6 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "impl-trait-for-tuples 0.2.0", "parity-scale-codec", @@ -6985,7 +6980,6 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", @@ -6996,7 +6990,6 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "chrono", "fdlimit", @@ -7034,7 +7027,6 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "derive_more", "fnv", @@ -7068,7 +7060,6 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "blake2-rfc", "hash-db", @@ -7098,7 +7089,6 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "sc-client-api", "sp-blockchain", @@ -7109,8 +7099,8 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ + "async-trait", "derive_more", "fork-tree", "futures 0.3.12", @@ -7155,7 +7145,6 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "derive_more", "futures 0.3.12", @@ -7179,7 +7168,6 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "fork-tree", "parity-scale-codec", @@ -7192,7 +7180,6 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -7218,21 +7205,15 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ - "log", "sc-client-api", "sp-authorship", - "sp-consensus", - "sp-core", - "sp-inherents", "sp-runtime", ] [[package]] name = "sc-executor" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "derive_more", "lazy_static", @@ -7261,7 +7242,6 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "derive_more", "parity-scale-codec", @@ -7277,7 +7257,6 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "log", "parity-scale-codec", @@ -7292,7 +7271,6 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "log", "parity-scale-codec", @@ -7310,7 +7288,6 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "derive_more", "finality-grandpa", @@ -7348,7 +7325,6 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "derive_more", "finality-grandpa", @@ -7372,7 +7348,6 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-warp-sync" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "derive_more", "futures 0.3.12", @@ -7392,7 +7367,6 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "ansi_term 0.12.1", "futures 0.3.12", @@ -7410,7 +7384,6 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "async-trait", "derive_more", @@ -7430,7 +7403,6 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "hash-db", "lazy_static", @@ -7449,7 +7421,6 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "async-std", "async-trait", @@ -7502,7 +7473,6 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -7518,7 +7488,6 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "bytes 0.5.6", "fnv", @@ -7545,7 +7514,6 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "futures 0.3.12", "libp2p", @@ -7558,7 +7526,6 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7567,7 +7534,6 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "futures 0.3.12", "hash-db", @@ -7601,7 +7567,6 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "derive_more", "futures 0.3.12", @@ -7625,7 +7590,6 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "futures 0.1.29", "jsonrpc-core", @@ -7643,9 +7607,8 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ - "directories 3.0.1", + "directories", "exit-future", "futures 0.1.29", "futures 0.3.12", @@ -7706,7 +7669,6 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "log", "parity-scale-codec", @@ -7721,7 +7683,6 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -7741,7 +7702,6 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "chrono", "futures 0.3.12", @@ -7763,7 +7723,6 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "ansi_term 0.12.1", "atty", @@ -7791,7 +7750,6 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", @@ -7802,7 +7760,6 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "derive_more", "futures 0.3.12", @@ -7824,7 +7781,6 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "futures 0.3.12", "futures-diagnose", @@ -8246,7 +8202,6 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "log", "sp-core", @@ -8258,7 +8213,6 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "hash-db", "parity-scale-codec", @@ -8274,7 +8228,6 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -8286,7 +8239,6 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "parity-scale-codec", "serde", @@ -8298,7 +8250,6 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "integer-sqrt", "num-traits 0.2.14", @@ -8311,7 +8262,6 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "parity-scale-codec", "sp-api", @@ -8323,7 +8273,6 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -8334,7 +8283,6 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "parity-scale-codec", "sp-api", @@ -8346,7 +8294,6 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "futures 0.3.12", "log", @@ -8364,7 +8311,6 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "serde", "serde_json", @@ -8373,8 +8319,8 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ + "async-trait", "futures 0.3.12", "futures-timer 3.0.2", "libp2p", @@ -8399,7 +8345,6 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "merlin", "parity-scale-codec", @@ -8413,13 +8358,11 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-std", - "sp-timestamp", ] [[package]] name = "sp-consensus-slots" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -8429,7 +8372,6 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -8441,7 +8383,6 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "base58", "blake2-rfc", @@ -8485,7 +8426,6 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -8494,7 +8434,6 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", @@ -8504,7 +8443,6 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "environmental", "parity-scale-codec", @@ -8515,7 +8453,6 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "finality-grandpa", "log", @@ -8532,11 +8469,12 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ + "async-trait", + "impl-trait-for-tuples 0.2.0", "parity-scale-codec", - "parking_lot 0.11.1", "sp-core", + "sp-runtime", "sp-std", "thiserror", ] @@ -8544,7 +8482,6 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "futures 0.3.12", "hash-db", @@ -8568,7 +8505,6 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "lazy_static", "sp-core", @@ -8579,7 +8515,6 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "async-trait", "derive_more", @@ -8596,7 +8531,6 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "parity-scale-codec", "serde", @@ -8609,7 +8543,6 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", @@ -8620,7 +8553,6 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "sp-api", "sp-core", @@ -8630,7 +8562,6 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "backtrace", ] @@ -8638,7 +8569,6 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "serde", "sp-core", @@ -8647,7 +8577,6 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "either", "hash256-std-hasher", @@ -8668,7 +8597,6 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "impl-trait-for-tuples 0.2.0", "parity-scale-codec", @@ -8685,7 +8613,6 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "Inflector", "proc-macro-crate", @@ -8697,7 +8624,6 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "serde", "serde_json", @@ -8706,7 +8632,6 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "parity-scale-codec", "sp-api", @@ -8719,7 +8644,6 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -8729,7 +8653,6 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "hash-db", "log", @@ -8751,12 +8674,10 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" [[package]] name = "sp-storage" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8769,7 +8690,6 @@ dependencies = [ [[package]] name = "sp-tasks" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "log", "sp-core", @@ -8782,21 +8702,22 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ + "futures-timer 3.0.2", "impl-trait-for-tuples 0.2.0", + "log", "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", "sp-std", + "thiserror", "wasm-timer", ] [[package]] name = "sp-tracing" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "log", "parity-scale-codec", @@ -8809,7 +8730,6 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "derive_more", "futures 0.3.12", @@ -8825,7 +8745,6 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "hash-db", "memory-db", @@ -8839,7 +8758,6 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "futures 0.3.12", "futures-core", @@ -8851,7 +8769,6 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8863,7 +8780,6 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "impl-trait-for-tuples 0.2.0", "parity-scale-codec", @@ -8995,7 +8911,6 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "chrono", "console_error_panic_hook", @@ -9022,7 +8937,6 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "platforms", ] @@ -9030,7 +8944,6 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.12", @@ -9053,7 +8966,6 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "async-std", "derive_more", @@ -9067,7 +8979,6 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "futures 0.1.29", "futures 0.3.12", @@ -9094,7 +9005,6 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "futures 0.3.12", "substrate-test-utils-derive", @@ -9104,7 +9014,6 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#09ba69f9e8e77eadc6acf22d3a96f2d54fd34e92" dependencies = [ "proc-macro-crate", "quote 1.0.7", @@ -9187,9 +9096,9 @@ checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e" [[package]] name = "target-lexicon" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab0e7238dcc7b40a7be719a25365910f6807bd864f4cce6b2e6b873658e2b19d" +checksum = "4ee5a98e506fb7231a304c3a1bd7c132a55016cf65001e0282480665870dfcb9" [[package]] name = "tempfile" @@ -10155,33 +10064,31 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32fddd575d477c6e9702484139cf9f23dcd554b06d185ed0f56c857dd3a47aa6" - -[[package]] -name = "wasmparser" -version = "0.59.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a950e6a618f62147fd514ff445b2a0b53120d382751960797f85f058c7eda9b9" +checksum = "89a30c99437829ede826802bfcf28500cf58df00e66cb9114df98813bc145ff1" [[package]] name = "wasmtime" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd3c4f449382779ef6e0a7c3ec6752ae614e20a42e4100000c3efdc973100e2" +checksum = "7426055cb92bd9a1e9469b48154d8d6119cd8c498c8b70284e420342c05dc45d" dependencies = [ "anyhow", "backtrace", - "cfg-if 0.1.10", - "lazy_static", + "bincode", + "cfg-if 1.0.0", + "cpp_demangle", + "indexmap", "libc", "log", "region", "rustc-demangle", + "serde", "smallvec 1.6.1", "target-lexicon", - "wasmparser 0.59.0", + "wasmparser", + "wasmtime-cache", "wasmtime-environ", "wasmtime-jit", "wasmtime-profiling", @@ -10190,74 +10097,101 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "wasmtime-cache" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c01d9287e36921e46f5887a47007824ae5dbb9b7517a2d565660ab4471478709" +dependencies = [ + "anyhow", + "base64 0.13.0", + "bincode", + "directories-next", + "errno", + "file-per-thread-logger", + "libc", + "log", + "serde", + "sha2 0.9.2", + "toml", + "winapi 0.3.9", + "zstd", +] + +[[package]] +name = "wasmtime-cranelift" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4134ed3a4316cd0de0e546c6004850afe472b0fa3fcdc2f2c15f8d449562d962" +dependencies = [ + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", + "cranelift-wasm", + "wasmtime-environ", +] + [[package]] name = "wasmtime-debug" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e634af9067a3af6cf2c7d33dc3b84767ddaf5d010ba68e80eecbcea73d4a349" +checksum = "e91fa931df6dd8af2b02606307674d3bad23f55473d5f4c809dddf7e4c4dc411" dependencies = [ "anyhow", - "gimli 0.21.0", + "gimli", "more-asserts", - "object 0.20.0", + "object 0.22.0", "target-lexicon", "thiserror", - "wasmparser 0.59.0", + "wasmparser", "wasmtime-environ", ] [[package]] name = "wasmtime-environ" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f85619a94ee4034bd5bb87fc3dcf71fd2237b81c840809da1201061eec9ab3" +checksum = "a1098871dc3120aaf8190d79153e470658bb79f63ee9ca31716711e123c28220" dependencies = [ "anyhow", - "base64 0.12.3", - "bincode", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "cranelift-codegen", "cranelift-entity", - "cranelift-frontend", "cranelift-wasm", - "directories 2.0.2", - "errno", - "file-per-thread-logger", + "gimli", "indexmap", - "libc", "log", "more-asserts", - "rayon", "serde", - "sha2 0.8.2", "thiserror", - "toml", - "wasmparser 0.59.0", - "winapi 0.3.9", - "zstd", + "wasmparser", ] [[package]] name = "wasmtime-jit" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e914c013c7a9f15f4e429d5431f2830fb8adb56e40567661b69c5ec1d645be23" +checksum = "738bfcd1561ede8bb174215776fd7d9a95d5f0a47ca3deabe0282c55f9a89f68" dependencies = [ + "addr2line", "anyhow", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "cranelift-codegen", "cranelift-entity", "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.21.0", + "gimli", "log", "more-asserts", - "object 0.20.0", + "object 0.22.0", + "rayon", "region", + "serde", "target-lexicon", "thiserror", - "wasmparser 0.59.0", + "wasmparser", + "wasmtime-cranelift", "wasmtime-debug", "wasmtime-environ", "wasmtime-obj", @@ -10268,13 +10202,13 @@ dependencies = [ [[package]] name = "wasmtime-obj" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e81d8e02e9bc9fe2da9b6d48bbc217f96e089f7df613f11a28a3958abc44641e" +checksum = "3e96d77f1801131c5e86d93e42a3cf8a35402107332c202c245c83f34888a906" dependencies = [ "anyhow", "more-asserts", - "object 0.20.0", + "object 0.22.0", "target-lexicon", "wasmtime-debug", "wasmtime-environ", @@ -10282,16 +10216,16 @@ dependencies = [ [[package]] name = "wasmtime-profiling" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e8d4d1af8dd5f7096cfcc89dd668d358e52980c38cce199643372ffd6590e27" +checksum = "60bb672c9d894776d7b9250dd9b4fe890f8760201ee4f53e5f2da772b6c4debb" dependencies = [ "anyhow", - "cfg-if 0.1.10", - "gimli 0.21.0", + "cfg-if 1.0.0", + "gimli", "lazy_static", "libc", - "object 0.19.0", + "object 0.22.0", "scroll", "serde", "target-lexicon", @@ -10301,19 +10235,20 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a25f140bbbaadb07c531cba99ce1a966dba216138dc1b2a0ddecec851a01a93" +checksum = "a978086740949eeedfefcee667b57a9e98d9a7fc0de382fcfa0da30369e3530d" dependencies = [ "backtrace", "cc", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "indexmap", "lazy_static", "libc", "log", - "memoffset", + "memoffset 0.6.1", "more-asserts", + "psm", "region", "thiserror", "wasmtime-environ", @@ -10654,3 +10589,239 @@ dependencies = [ "itertools", "libc", ] + +[[patch.unused]] +name = "chain-spec-builder" +version = "2.0.0" + +[[patch.unused]] +name = "frame-support-test" +version = "2.0.1" + +[[patch.unused]] +name = "node-bench" +version = "0.8.0" + +[[patch.unused]] +name = "node-browser-testing" +version = "2.0.0" + +[[patch.unused]] +name = "node-cli" +version = "2.0.0" + +[[patch.unused]] +name = "node-executor" +version = "2.0.0" + +[[patch.unused]] +name = "node-inspect" +version = "0.8.0" + +[[patch.unused]] +name = "node-primitives" +version = "2.0.0" + +[[patch.unused]] +name = "node-rpc" +version = "2.0.0" + +[[patch.unused]] +name = "node-rpc-client" +version = "2.0.0" + +[[patch.unused]] +name = "node-runtime" +version = "2.0.1" + +[[patch.unused]] +name = "node-template" +version = "2.0.0" + +[[patch.unused]] +name = "node-template-runtime" +version = "2.0.0" + +[[patch.unused]] +name = "node-testing" +version = "2.0.0" + +[[patch.unused]] +name = "pallet-assets" +version = "2.0.1" + +[[patch.unused]] +name = "pallet-atomic-swap" +version = "2.0.1" + +[[patch.unused]] +name = "pallet-aura" +version = "2.0.1" + +[[patch.unused]] +name = "pallet-contracts" +version = "2.0.1" + +[[patch.unused]] +name = "pallet-contracts-primitives" +version = "2.0.1" + +[[patch.unused]] +name = "pallet-contracts-proc-macro" +version = "0.1.0" + +[[patch.unused]] +name = "pallet-contracts-rpc" +version = "0.8.1" + +[[patch.unused]] +name = "pallet-contracts-rpc-runtime-api" +version = "0.8.1" + +[[patch.unused]] +name = "pallet-elections" +version = "2.0.1" + +[[patch.unused]] +name = "pallet-example" +version = "2.0.0" + +[[patch.unused]] +name = "pallet-example-offchain-worker" +version = "2.0.1" + +[[patch.unused]] +name = "pallet-example-parallel" +version = "2.0.1" + +[[patch.unused]] +name = "pallet-lottery" +version = "2.0.0" + +[[patch.unused]] +name = "pallet-mmr" +version = "2.0.1" + +[[patch.unused]] +name = "pallet-mmr-primitives" +version = "2.0.0" + +[[patch.unused]] +name = "pallet-node-authorization" +version = "2.0.0" + +[[patch.unused]] +name = "pallet-scored-pool" +version = "2.0.1" + +[[patch.unused]] +name = "pallet-staking-fuzz" +version = "0.0.0" + +[[patch.unused]] +name = "pallet-template" +version = "2.0.0" + +[[patch.unused]] +name = "sc-consensus-aura" +version = "0.8.1" + +[[patch.unused]] +name = "sc-consensus-manual-seal" +version = "0.8.1" + +[[patch.unused]] +name = "sc-consensus-pow" +version = "0.8.1" + +[[patch.unused]] +name = "sc-network-test" +version = "0.8.0" + +[[patch.unused]] +name = "sc-runtime-test" +version = "2.0.0" + +[[patch.unused]] +name = "sc-service-test" +version = "2.0.0" + +[[patch.unused]] +name = "sp-api-test" +version = "2.0.1" + +[[patch.unused]] +name = "sp-application-crypto-test" +version = "2.0.0" + +[[patch.unused]] +name = "sp-arithmetic-fuzzer" +version = "2.0.0" + +[[patch.unused]] +name = "sp-consensus-aura" +version = "0.8.1" + +[[patch.unused]] +name = "sp-consensus-pow" +version = "0.8.1" + +[[patch.unused]] +name = "sp-election-providers" +version = "2.0.0" + +[[patch.unused]] +name = "sp-npos-elections-fuzzer" +version = "2.0.0-alpha.5" + +[[patch.unused]] +name = "sp-runtime-interface-test" +version = "2.0.0" + +[[patch.unused]] +name = "sp-runtime-interface-test-wasm" +version = "2.0.0" + +[[patch.unused]] +name = "sp-runtime-interface-test-wasm-deprecated" +version = "2.0.0" + +[[patch.unused]] +name = "sp-sandbox" +version = "0.8.1" + +[[patch.unused]] +name = "sp-test-primitives" +version = "2.0.0" + +[[patch.unused]] +name = "subkey" +version = "2.0.0" + +[[patch.unused]] +name = "substrate-frame-cli" +version = "2.0.1" + +[[patch.unused]] +name = "substrate-frame-rpc-support" +version = "2.0.1" + +[[patch.unused]] +name = "substrate-test-runtime" +version = "2.0.0" + +[[patch.unused]] +name = "substrate-test-runtime-client" +version = "2.0.0" + +[[patch.unused]] +name = "substrate-test-runtime-transaction-pool" +version = "2.0.0" + +[[patch.unused]] +name = "substrate-test-utils-test-crate" +version = "0.1.0" + +[[patch.unused]] +name = "substrate-wasm-builder" +version = "3.0.0" diff --git a/Cargo.toml b/Cargo.toml index 082631cc62a6..fdd14f1c20eb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -91,6 +91,205 @@ panic = "unwind" [features] runtime-benchmarks=["cli/runtime-benchmarks"] real-overseer=["cli/real-overseer"] +[patch."https://github.com/paritytech/substrate"] +node-template ={path = "/home/bastian/projects/parity/substrate2/bin/node-template/node" } +frame-benchmarking ={path = "/home/bastian/projects/parity/substrate2/frame/benchmarking" } +frame-support ={path = "/home/bastian/projects/parity/substrate2/frame/support" } +frame-metadata ={path = "/home/bastian/projects/parity/substrate2/frame/metadata" } +sp-core ={path = "/home/bastian/projects/parity/substrate2/primitives/core" } +sp-debug-derive ={path = "/home/bastian/projects/parity/substrate2/primitives/debug-derive" } +sp-externalities ={path = "/home/bastian/projects/parity/substrate2/primitives/externalities" } +sp-std ={path = "/home/bastian/projects/parity/substrate2/primitives/std" } +sp-storage ={path = "/home/bastian/projects/parity/substrate2/primitives/storage" } +sp-runtime-interface ={path = "/home/bastian/projects/parity/substrate2/primitives/runtime-interface" } +sp-runtime-interface-proc-macro ={path = "/home/bastian/projects/parity/substrate2/primitives/runtime-interface/proc-macro" } +sp-tracing ={path = "/home/bastian/projects/parity/substrate2/primitives/tracing" } +sp-wasm-interface ={path = "/home/bastian/projects/parity/substrate2/primitives/wasm-interface" } +sp-io ={path = "/home/bastian/projects/parity/substrate2/primitives/io" } +sp-keystore ={path = "/home/bastian/projects/parity/substrate2/primitives/keystore" } +sp-state-machine ={path = "/home/bastian/projects/parity/substrate2/primitives/state-machine" } +sp-panic-handler ={path = "/home/bastian/projects/parity/substrate2/primitives/panic-handler" } +sp-trie ={path = "/home/bastian/projects/parity/substrate2/primitives/trie" } +sp-runtime ={path = "/home/bastian/projects/parity/substrate2/primitives/runtime" } +sp-application-crypto ={path = "/home/bastian/projects/parity/substrate2/primitives/application-crypto" } +sp-arithmetic ={path = "/home/bastian/projects/parity/substrate2/primitives/arithmetic" } +sp-runtime-interface-test-wasm ={path = "/home/bastian/projects/parity/substrate2/primitives/runtime-interface/test-wasm" } +substrate-wasm-builder ={path = "/home/bastian/projects/parity/substrate2/utils/wasm-builder" } +sp-serializer ={path = "/home/bastian/projects/parity/substrate2/primitives/serializer" } +frame-support-procedural ={path = "/home/bastian/projects/parity/substrate2/frame/support/procedural" } +frame-support-procedural-tools ={path = "/home/bastian/projects/parity/substrate2/frame/support/procedural/tools" } +frame-support-procedural-tools-derive ={path = "/home/bastian/projects/parity/substrate2/frame/support/procedural/tools/derive" } +sp-inherents ={path = "/home/bastian/projects/parity/substrate2/primitives/inherents" } +sp-staking ={path = "/home/bastian/projects/parity/substrate2/primitives/staking" } +frame-system ={path = "/home/bastian/projects/parity/substrate2/frame/system" } +sp-version ={path = "/home/bastian/projects/parity/substrate2/primitives/version" } +substrate-test-runtime-client ={path = "/home/bastian/projects/parity/substrate2/test-utils/runtime/client" } +sc-block-builder ={path = "/home/bastian/projects/parity/substrate2/client/block-builder" } +sc-client-api ={path = "/home/bastian/projects/parity/substrate2/client/api" } +substrate-prometheus-endpoint ={path = "/home/bastian/projects/parity/substrate2/utils/prometheus" } +sc-executor ={path = "/home/bastian/projects/parity/substrate2/client/executor" } +sc-executor-common ={path = "/home/bastian/projects/parity/substrate2/client/executor/common" } +sp-allocator ={path = "/home/bastian/projects/parity/substrate2/primitives/allocator" } +sc-executor-wasmi ={path = "/home/bastian/projects/parity/substrate2/client/executor/wasmi" } +sc-executor-wasmtime ={path = "/home/bastian/projects/parity/substrate2/client/executor/wasmtime" } +sp-api ={path = "/home/bastian/projects/parity/substrate2/primitives/api" } +sp-api-proc-macro ={path = "/home/bastian/projects/parity/substrate2/primitives/api/proc-macro" } +sp-test-primitives ={path = "/home/bastian/projects/parity/substrate2/primitives/test-primitives" } +sp-tasks ={path = "/home/bastian/projects/parity/substrate2/primitives/tasks" } +sc-runtime-test ={path = "/home/bastian/projects/parity/substrate2/client/executor/runtime-test" } +sp-sandbox ={path = "/home/bastian/projects/parity/substrate2/primitives/sandbox" } +sc-tracing ={path = "/home/bastian/projects/parity/substrate2/client/tracing" } +sc-telemetry ={path = "/home/bastian/projects/parity/substrate2/client/telemetry" } +sp-utils ={path = "/home/bastian/projects/parity/substrate2/primitives/utils" } +sc-tracing-proc-macro ={path = "/home/bastian/projects/parity/substrate2/client/tracing/proc-macro" } +substrate-test-runtime ={path = "/home/bastian/projects/parity/substrate2/test-utils/runtime" } +frame-executive ={path = "/home/bastian/projects/parity/substrate2/frame/executive" } +pallet-balances ={path = "/home/bastian/projects/parity/substrate2/frame/balances" } +pallet-transaction-payment ={path = "/home/bastian/projects/parity/substrate2/frame/transaction-payment" } +pallet-indices ={path = "/home/bastian/projects/parity/substrate2/frame/indices" } +sp-keyring ={path = "/home/bastian/projects/parity/substrate2/primitives/keyring" } +frame-system-rpc-runtime-api ={path = "/home/bastian/projects/parity/substrate2/frame/system/rpc/runtime-api" } +pallet-babe ={path = "/home/bastian/projects/parity/substrate2/frame/babe" } +pallet-authorship ={path = "/home/bastian/projects/parity/substrate2/frame/authorship" } +sp-authorship ={path = "/home/bastian/projects/parity/substrate2/primitives/authorship" } +pallet-session ={path = "/home/bastian/projects/parity/substrate2/frame/session" } +pallet-timestamp ={path = "/home/bastian/projects/parity/substrate2/frame/timestamp" } +sp-timestamp ={path = "/home/bastian/projects/parity/substrate2/primitives/timestamp" } +sp-session ={path = "/home/bastian/projects/parity/substrate2/primitives/session" } +sp-consensus-babe ={path = "/home/bastian/projects/parity/substrate2/primitives/consensus/babe" } +sp-consensus ={path = "/home/bastian/projects/parity/substrate2/primitives/consensus/common" } +sp-consensus-slots ={path = "/home/bastian/projects/parity/substrate2/primitives/consensus/slots" } +sp-consensus-vrf ={path = "/home/bastian/projects/parity/substrate2/primitives/consensus/vrf" } +pallet-offences ={path = "/home/bastian/projects/parity/substrate2/frame/offences" } +pallet-staking ={path = "/home/bastian/projects/parity/substrate2/frame/staking" } +sp-npos-elections ={path = "/home/bastian/projects/parity/substrate2/primitives/npos-elections" } +sp-npos-elections-compact ={path = "/home/bastian/projects/parity/substrate2/primitives/npos-elections/compact" } +substrate-test-utils ={path = "/home/bastian/projects/parity/substrate2/test-utils" } +substrate-test-utils-derive ={path = "/home/bastian/projects/parity/substrate2/test-utils/derive" } +sc-service ={path = "/home/bastian/projects/parity/substrate2/client/service" } +sc-chain-spec ={path = "/home/bastian/projects/parity/substrate2/client/chain-spec" } +sc-chain-spec-derive ={path = "/home/bastian/projects/parity/substrate2/client/chain-spec/derive" } +sc-consensus-babe ={path = "/home/bastian/projects/parity/substrate2/client/consensus/babe" } +fork-tree ={path = "/home/bastian/projects/parity/substrate2/utils/fork-tree" } +sc-consensus-epochs ={path = "/home/bastian/projects/parity/substrate2/client/consensus/epochs" } +sp-blockchain ={path = "/home/bastian/projects/parity/substrate2/primitives/blockchain" } +sp-database ={path = "/home/bastian/projects/parity/substrate2/primitives/database" } +sc-consensus-slots ={path = "/home/bastian/projects/parity/substrate2/client/consensus/slots" } +sc-consensus-uncles ={path = "/home/bastian/projects/parity/substrate2/client/consensus/uncles" } +sc-keystore ={path = "/home/bastian/projects/parity/substrate2/client/keystore" } +sp-block-builder ={path = "/home/bastian/projects/parity/substrate2/primitives/block-builder" } +sc-network ={path = "/home/bastian/projects/parity/substrate2/client/network" } +sc-peerset ={path = "/home/bastian/projects/parity/substrate2/client/peerset" } +sc-network-test ={path = "/home/bastian/projects/parity/substrate2/client/network/test" } +sc-consensus ={path = "/home/bastian/projects/parity/substrate2/client/consensus/common" } +sc-finality-grandpa ={path = "/home/bastian/projects/parity/substrate2/client/finality-grandpa" } +sc-network-gossip ={path = "/home/bastian/projects/parity/substrate2/client/network-gossip" } +sp-finality-grandpa ={path = "/home/bastian/projects/parity/substrate2/primitives/finality-grandpa" } +sp-chain-spec ={path = "/home/bastian/projects/parity/substrate2/primitives/chain-spec" } +sc-client-db ={path = "/home/bastian/projects/parity/substrate2/client/db" } +sc-state-db ={path = "/home/bastian/projects/parity/substrate2/client/state-db" } +sc-informant ={path = "/home/bastian/projects/parity/substrate2/client/informant" } +sp-transaction-pool ={path = "/home/bastian/projects/parity/substrate2/primitives/transaction-pool" } +sc-light ={path = "/home/bastian/projects/parity/substrate2/client/light" } +sc-offchain ={path = "/home/bastian/projects/parity/substrate2/client/offchain" } +sp-offchain ={path = "/home/bastian/projects/parity/substrate2/primitives/offchain" } +sc-transaction-pool ={path = "/home/bastian/projects/parity/substrate2/client/transaction-pool" } +sc-transaction-graph ={path = "/home/bastian/projects/parity/substrate2/client/transaction-pool/graph" } +substrate-test-runtime-transaction-pool ={path = "/home/bastian/projects/parity/substrate2/test-utils/runtime/transaction-pool" } +sc-rpc ={path = "/home/bastian/projects/parity/substrate2/client/rpc" } +sc-rpc-api ={path = "/home/bastian/projects/parity/substrate2/client/rpc-api" } +sp-rpc ={path = "/home/bastian/projects/parity/substrate2/primitives/rpc" } +sc-cli ={path = "/home/bastian/projects/parity/substrate2/client/cli" } +sc-rpc-server ={path = "/home/bastian/projects/parity/substrate2/client/rpc-servers" } +pallet-staking-reward-curve ={path = "/home/bastian/projects/parity/substrate2/frame/staking/reward-curve" } +sp-consensus-aura ={path = "/home/bastian/projects/parity/substrate2/primitives/consensus/aura" } +substrate-test-client ={path = "/home/bastian/projects/parity/substrate2/test-utils/client" } +frame-benchmarking-cli ={path = "/home/bastian/projects/parity/substrate2/utils/frame/benchmarking-cli" } +node-template-runtime ={path = "/home/bastian/projects/parity/substrate2/bin/node-template/runtime" } +frame-system-benchmarking ={path = "/home/bastian/projects/parity/substrate2/frame/system/benchmarking" } +pallet-aura ={path = "/home/bastian/projects/parity/substrate2/frame/aura" } +pallet-grandpa ={path = "/home/bastian/projects/parity/substrate2/frame/grandpa" } +pallet-randomness-collective-flip ={path = "/home/bastian/projects/parity/substrate2/frame/randomness-collective-flip" } +pallet-sudo ={path = "/home/bastian/projects/parity/substrate2/frame/sudo" } +pallet-transaction-payment-rpc-runtime-api ={path = "/home/bastian/projects/parity/substrate2/frame/transaction-payment/rpc/runtime-api" } +pallet-template ={path = "/home/bastian/projects/parity/substrate2/bin/node-template/pallets/template" } +pallet-transaction-payment-rpc ={path = "/home/bastian/projects/parity/substrate2/frame/transaction-payment/rpc" } +sc-basic-authorship ={path = "/home/bastian/projects/parity/substrate2/client/basic-authorship" } +sc-proposer-metrics ={path = "/home/bastian/projects/parity/substrate2/client/proposer-metrics" } +sc-consensus-aura ={path = "/home/bastian/projects/parity/substrate2/client/consensus/aura" } +substrate-frame-rpc-system ={path = "/home/bastian/projects/parity/substrate2/utils/frame/rpc/system" } +substrate-build-script-utils ={path = "/home/bastian/projects/parity/substrate2/utils/build-script-utils" } +node-bench ={path = "/home/bastian/projects/parity/substrate2/bin/node/bench" } +node-primitives ={path = "/home/bastian/projects/parity/substrate2/bin/node/primitives" } +node-runtime ={path = "/home/bastian/projects/parity/substrate2/bin/node/runtime" } +pallet-assets ={path = "/home/bastian/projects/parity/substrate2/frame/assets" } +pallet-authority-discovery ={path = "/home/bastian/projects/parity/substrate2/frame/authority-discovery" } +sp-authority-discovery ={path = "/home/bastian/projects/parity/substrate2/primitives/authority-discovery" } +pallet-bounties ={path = "/home/bastian/projects/parity/substrate2/frame/bounties" } +pallet-treasury ={path = "/home/bastian/projects/parity/substrate2/frame/treasury" } +pallet-collective ={path = "/home/bastian/projects/parity/substrate2/frame/collective" } +pallet-contracts ={path = "/home/bastian/projects/parity/substrate2/frame/contracts" } +pallet-contracts-primitives ={path = "/home/bastian/projects/parity/substrate2/frame/contracts/common" } +pallet-contracts-proc-macro ={path = "/home/bastian/projects/parity/substrate2/frame/contracts/proc-macro" } +pallet-contracts-rpc-runtime-api ={path = "/home/bastian/projects/parity/substrate2/frame/contracts/rpc/runtime-api" } +pallet-democracy ={path = "/home/bastian/projects/parity/substrate2/frame/democracy" } +pallet-scheduler ={path = "/home/bastian/projects/parity/substrate2/frame/scheduler" } +pallet-elections-phragmen ={path = "/home/bastian/projects/parity/substrate2/frame/elections-phragmen" } +pallet-identity ={path = "/home/bastian/projects/parity/substrate2/frame/identity" } +pallet-im-online ={path = "/home/bastian/projects/parity/substrate2/frame/im-online" } +pallet-lottery ={path = "/home/bastian/projects/parity/substrate2/frame/lottery" } +pallet-membership ={path = "/home/bastian/projects/parity/substrate2/frame/membership" } +pallet-mmr ={path = "/home/bastian/projects/parity/substrate2/frame/merkle-mountain-range" } +pallet-mmr-primitives ={path = "/home/bastian/projects/parity/substrate2/frame/merkle-mountain-range/primitives" } +pallet-multisig ={path = "/home/bastian/projects/parity/substrate2/frame/multisig" } +pallet-offences-benchmarking ={path = "/home/bastian/projects/parity/substrate2/frame/offences/benchmarking" } +pallet-proxy ={path = "/home/bastian/projects/parity/substrate2/frame/proxy" } +pallet-utility ={path = "/home/bastian/projects/parity/substrate2/frame/utility" } +pallet-recovery ={path = "/home/bastian/projects/parity/substrate2/frame/recovery" } +pallet-session-benchmarking ={path = "/home/bastian/projects/parity/substrate2/frame/session/benchmarking" } +pallet-society ={path = "/home/bastian/projects/parity/substrate2/frame/society" } +pallet-tips ={path = "/home/bastian/projects/parity/substrate2/frame/tips" } +pallet-vesting ={path = "/home/bastian/projects/parity/substrate2/frame/vesting" } +node-testing ={path = "/home/bastian/projects/parity/substrate2/bin/node/testing" } +node-executor ={path = "/home/bastian/projects/parity/substrate2/bin/node/executor" } +node-browser-testing ={path = "/home/bastian/projects/parity/substrate2/bin/node/browser-testing" } +node-cli ={path = "/home/bastian/projects/parity/substrate2/bin/node/cli" } +substrate-browser-utils ={path = "/home/bastian/projects/parity/substrate2/utils/browser" } +node-inspect ={path = "/home/bastian/projects/parity/substrate2/bin/node/inspect" } +node-rpc ={path = "/home/bastian/projects/parity/substrate2/bin/node/rpc" } +pallet-contracts-rpc ={path = "/home/bastian/projects/parity/substrate2/frame/contracts/rpc" } +sc-consensus-babe-rpc ={path = "/home/bastian/projects/parity/substrate2/client/consensus/babe/rpc" } +sc-finality-grandpa-rpc ={path = "/home/bastian/projects/parity/substrate2/client/finality-grandpa/rpc" } +sc-sync-state-rpc ={path = "/home/bastian/projects/parity/substrate2/client/sync-state-rpc" } +sc-authority-discovery ={path = "/home/bastian/projects/parity/substrate2/client/authority-discovery" } +sc-finality-grandpa-warp-sync ={path = "/home/bastian/projects/parity/substrate2/client/finality-grandpa-warp-sync" } +sc-service-test ={path = "/home/bastian/projects/parity/substrate2/client/service/test" } +substrate-frame-cli ={path = "/home/bastian/projects/parity/substrate2/utils/frame/frame-utilities-cli" } +node-rpc-client ={path = "/home/bastian/projects/parity/substrate2/bin/node/rpc-client" } +chain-spec-builder ={path = "/home/bastian/projects/parity/substrate2/bin/utils/chain-spec-builder" } +subkey ={path = "/home/bastian/projects/parity/substrate2/bin/utils/subkey" } +sc-consensus-manual-seal ={path = "/home/bastian/projects/parity/substrate2/client/consensus/manual-seal" } +sc-consensus-pow ={path = "/home/bastian/projects/parity/substrate2/client/consensus/pow" } +sp-consensus-pow ={path = "/home/bastian/projects/parity/substrate2/primitives/consensus/pow" } +pallet-atomic-swap ={path = "/home/bastian/projects/parity/substrate2/frame/atomic-swap" } +pallet-elections ={path = "/home/bastian/projects/parity/substrate2/frame/elections" } +pallet-example ={path = "/home/bastian/projects/parity/substrate2/frame/example" } +pallet-example-offchain-worker ={path = "/home/bastian/projects/parity/substrate2/frame/example-offchain-worker" } +pallet-example-parallel ={path = "/home/bastian/projects/parity/substrate2/frame/example-parallel" } +pallet-nicks ={path = "/home/bastian/projects/parity/substrate2/frame/nicks" } +pallet-node-authorization ={path = "/home/bastian/projects/parity/substrate2/frame/node-authorization" } +pallet-scored-pool ={path = "/home/bastian/projects/parity/substrate2/frame/scored-pool" } +pallet-staking-fuzz ={path = "/home/bastian/projects/parity/substrate2/frame/staking/fuzzer" } +frame-support-test ={path = "/home/bastian/projects/parity/substrate2/frame/support/test" } +sp-api-test ={path = "/home/bastian/projects/parity/substrate2/primitives/api/test" } +sp-application-crypto-test ={path = "/home/bastian/projects/parity/substrate2/primitives/application-crypto/test" } +sp-arithmetic-fuzzer ={path = "/home/bastian/projects/parity/substrate2/primitives/arithmetic/fuzzer" } +sp-election-providers ={path = "/home/bastian/projects/parity/substrate2/primitives/election-providers" } +sp-npos-elections-fuzzer ={path = "/home/bastian/projects/parity/substrate2/primitives/npos-elections/fuzzer" } +sp-runtime-interface-test ={path = "/home/bastian/projects/parity/substrate2/primitives/runtime-interface/test" } +sp-runtime-interface-test-wasm-deprecated ={path = "/home/bastian/projects/parity/substrate2/primitives/runtime-interface/test-wasm-deprecated" } +substrate-test-utils-test-crate ={path = "/home/bastian/projects/parity/substrate2/test-utils/test-crate" } +substrate-frame-rpc-support ={path = "/home/bastian/projects/parity/substrate2/utils/frame/rpc/support" } # Configuration for building a .deb package - for use with `cargo-deb` [package.metadata.deb] diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index 9b4414349102..17aabd9140d8 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -15,6 +15,7 @@ sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "bkc sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-consensus-uncles = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } sc-executor = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } sc-finality-grandpa-warp-sync = { git = "https://github.com/paritytech/substrate", optional = true , branch = "bkchr-inherent-something-future" } sc-network = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } @@ -24,7 +25,6 @@ telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/sub # Substrate Primitives sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } @@ -40,6 +40,8 @@ sp-session = { git = "https://github.com/paritytech/substrate", branch = "bkchr- sp-storage = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } sp-trie = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } # Substrate Pallets diff --git a/node/service/src/chain_spec.rs b/node/service/src/chain_spec.rs index 4908ff717e4b..03aa44c108c9 100644 --- a/node/service/src/chain_spec.rs +++ b/node/service/src/chain_spec.rs @@ -17,7 +17,7 @@ //! Polkadot chain configurations. use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId; -use babe_primitives::AuthorityId as BabeId; +use sp_consensus_babe::AuthorityId as BabeId; use grandpa::AuthorityId as GrandpaId; use hex_literal::hex; use kusama::constants::currency::DOTS as KSM; diff --git a/node/service/src/client.rs b/node/service/src/client.rs index 4fa4334625d2..830dbac13ba3 100644 --- a/node/service/src/client.rs +++ b/node/service/src/client.rs @@ -31,7 +31,7 @@ use consensus_common::BlockStatus; pub trait RuntimeApiCollection: sp_transaction_pool::runtime_api::TaggedTransactionQueue + sp_api::ApiExt - + babe_primitives::BabeApi + + sp_consensus_babe::BabeApi + grandpa_primitives::GrandpaApi + ParachainHost + sp_block_builder::BlockBuilder @@ -49,7 +49,7 @@ impl RuntimeApiCollection for Api where Api: sp_transaction_pool::runtime_api::TaggedTransactionQueue + sp_api::ApiExt - + babe_primitives::BabeApi + + sp_consensus_babe::BabeApi + grandpa_primitives::GrandpaApi + ParachainHost + sp_block_builder::BlockBuilder diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index 8dce808b4c10..6161f22ae384 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -231,8 +231,6 @@ fn new_partial(config: &mut Configuration, jaeger_agent: O set_prometheus_registry(config)?; - let inherent_data_providers = inherents::InherentDataProviders::new(); - let (client, backend, keystore_container, task_manager) = service::new_full_parts::(&config)?; let client = Arc::new(client); @@ -271,13 +269,31 @@ fn new_partial(config: &mut Configuration, jaeger_agent: O client.clone(), )?; + let slot_duration = babe_link.config().slot_duration(); let import_queue = babe::import_queue( babe_link.clone(), block_import.clone(), Some(Box::new(justification_import)), client.clone(), select_chain.clone(), - inherent_data_providers.clone(), + move |_, ()| async move { + let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); + + let slot = + sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_duration( + timestamp.timestamp(), + slot_duration, + ); + + let current_timestamp = timestamp.timestamp(); + let current_slot = slot.slot(); + + Ok(sc_consensus_slots::SlotsInherentDataProviders::new( + current_timestamp, + current_slot, + (timestamp, slot), + )) + }, &task_manager.spawn_handle(), config.prometheus_registry(), consensus_common::CanAuthorWithNativeVersion::new(client.executor().clone()), @@ -337,7 +353,6 @@ fn new_partial(config: &mut Configuration, jaeger_agent: O select_chain, import_queue, transaction_pool, - inherent_data_providers, other: (rpc_extensions_builder, import_setup, rpc_setup) }) } @@ -570,7 +585,6 @@ pub fn new_full( select_chain, import_queue, transaction_pool, - inherent_data_providers, other: (rpc_extensions_builder, import_setup, rpc_setup) } = new_partial::(&mut config, jaeger_agent)?; @@ -749,6 +763,8 @@ pub fn new_full( prometheus_registry.as_ref(), ); + let client_clone = client.clone(); + let slot_duration = babe_link.config().slot_duration(); let babe_config = babe::BabeParams { keystore: keystore_container.sync_keystore(), client: client.clone(), @@ -756,7 +772,32 @@ pub fn new_full( block_import, env: proposer, sync_oracle: network.clone(), - inherent_data_providers: inherent_data_providers.clone(), + inherent_data_providers: move |at, ()| { + let client_clone = client_clone.clone(); + async move { + let uncles = sc_consensus_uncles::create_uncles_inherent_data_provider( + &*client_clone, + at, + )?; + + let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); + + let slot = + sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_duration( + timestamp.timestamp(), + slot_duration, + ); + + let current_timestamp = timestamp.timestamp(); + let current_slot = slot.slot(); + + Ok(sc_consensus_slots::SlotsInherentDataProviders::new( + current_timestamp, + current_slot, + (uncles, timestamp, slot), + )) + } + }, force_authoring, backoff_authoring_blocks, babe_link, @@ -884,16 +925,32 @@ fn new_light(mut config: Configuration) -> Result<( client.clone(), )?; - let inherent_data_providers = inherents::InherentDataProviders::new(); - // FIXME: pruning task isn't started since light client doesn't do `AuthoritySetup`. + let slot_duration = babe_link.config().slot_duration(); let import_queue = babe::import_queue( babe_link, babe_block_import, Some(Box::new(justification_import)), client.clone(), select_chain.clone(), - inherent_data_providers.clone(), + move |_, ()| async move { + let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); + + let slot = + sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_duration( + timestamp.timestamp(), + slot_duration, + ); + + let current_timestamp = timestamp.timestamp(); + let current_slot = slot.slot(); + + Ok(sc_consensus_slots::SlotsInherentDataProviders::new( + current_timestamp, + current_slot, + (timestamp, slot), + )) + }, &task_manager.spawn_handle(), config.prometheus_registry(), consensus_common::NeverCanAuthor, From 0a37176940fd41533e6c47c6d1db0081eddd2271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 18 Feb 2021 13:27:19 +0100 Subject: [PATCH 03/25] Compile --- Cargo.lock | 279 ++++++++++++++++++++-------------------- node/service/src/lib.rs | 9 +- 2 files changed, 143 insertions(+), 145 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1f5819ddf063..5db2b5672428 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1581,7 +1581,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "parity-scale-codec", ] @@ -1599,7 +1599,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-support", "frame-system", @@ -1617,7 +1617,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "Inflector", "chrono", @@ -1640,7 +1640,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-support", "frame-system", @@ -1656,7 +1656,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "13.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "parity-scale-codec", "serde", @@ -1667,7 +1667,7 @@ dependencies = [ [[package]] name = "frame-support" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "bitflags", "frame-metadata", @@ -1693,7 +1693,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -1705,7 +1705,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1717,7 +1717,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "proc-macro2", "quote", @@ -1727,7 +1727,7 @@ dependencies = [ [[package]] name = "frame-system" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1743,7 +1743,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-benchmarking", "frame-support", @@ -1757,7 +1757,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "parity-scale-codec", "sp-api", @@ -3992,7 +3992,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b" [[package]] name = "pallet-authority-discovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-support", "frame-system", @@ -4008,7 +4008,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-support", "frame-system", @@ -4023,7 +4023,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4048,7 +4048,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4062,7 +4062,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4077,7 +4077,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4093,7 +4093,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4108,7 +4108,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4123,7 +4123,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4144,7 +4144,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4160,7 +4160,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4179,7 +4179,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4196,7 +4196,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-support", "frame-system", @@ -4210,7 +4210,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4226,7 +4226,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-support", "frame-system", @@ -4240,7 +4240,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-support", "frame-system", @@ -4255,7 +4255,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4276,7 +4276,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4292,7 +4292,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-support", "frame-system", @@ -4305,7 +4305,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "enumflags2", "frame-support", @@ -4320,7 +4320,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4335,7 +4335,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-support", "frame-system", @@ -4355,7 +4355,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4371,7 +4371,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-support", "frame-system", @@ -4385,7 +4385,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4407,7 +4407,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4418,7 +4418,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-support", "frame-system", @@ -4432,7 +4432,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4450,7 +4450,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4465,7 +4465,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-support", "frame-system", @@ -4481,7 +4481,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4498,7 +4498,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -4509,7 +4509,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4525,7 +4525,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4541,7 +4541,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "enumflags2", "frame-benchmarking", @@ -6908,7 +6908,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "async-trait", "derive_more", @@ -6936,7 +6936,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -6959,7 +6959,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6976,7 +6976,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -6997,7 +6997,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7008,7 +7008,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "chrono", "fdlimit", @@ -7046,7 +7046,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "derive_more", "fnv", @@ -7080,7 +7080,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "blake2-rfc", "hash-db", @@ -7110,7 +7110,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "sc-client-api", "sp-blockchain", @@ -7121,7 +7121,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "async-trait", "derive_more", @@ -7168,7 +7168,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "derive_more", "futures 0.3.12", @@ -7192,7 +7192,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "fork-tree", "parity-scale-codec", @@ -7205,7 +7205,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -7231,7 +7231,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "sc-client-api", "sp-authorship", @@ -7242,7 +7242,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "derive_more", "lazy_static", @@ -7271,7 +7271,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "derive_more", "parity-scale-codec", @@ -7287,7 +7287,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "log", "parity-scale-codec", @@ -7302,7 +7302,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "log", "parity-scale-codec", @@ -7320,7 +7320,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "derive_more", "dyn-clone", @@ -7359,7 +7359,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "derive_more", "finality-grandpa", @@ -7383,7 +7383,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-warp-sync" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "derive_more", "futures 0.3.12", @@ -7403,7 +7403,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "ansi_term 0.12.1", "futures 0.3.12", @@ -7421,7 +7421,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "async-trait", "derive_more", @@ -7441,7 +7441,7 @@ dependencies = [ [[package]] name = "sc-light" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "hash-db", "lazy_static", @@ -7460,7 +7460,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "async-std", "async-trait", @@ -7513,7 +7513,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -7529,7 +7529,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "bytes 0.5.6", "fnv", @@ -7556,7 +7556,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "futures 0.3.12", "libp2p", @@ -7569,7 +7569,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7578,7 +7578,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "futures 0.3.12", "hash-db", @@ -7612,7 +7612,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "derive_more", "futures 0.3.12", @@ -7636,7 +7636,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "futures 0.1.29", "jsonrpc-core", @@ -7654,7 +7654,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "directories", "exit-future", @@ -7717,7 +7717,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "log", "parity-scale-codec", @@ -7732,7 +7732,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -7752,7 +7752,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "chrono", "futures 0.3.12", @@ -7774,7 +7774,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "ansi_term 0.12.1", "atty", @@ -7802,7 +7802,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7813,7 +7813,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "derive_more", "futures 0.3.12", @@ -7835,7 +7835,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "futures 0.3.12", "futures-diagnose", @@ -8241,7 +8241,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "log", "sp-core", @@ -8253,7 +8253,7 @@ dependencies = [ [[package]] name = "sp-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "hash-db", "parity-scale-codec", @@ -8269,7 +8269,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -8281,7 +8281,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "parity-scale-codec", "serde", @@ -8293,7 +8293,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "integer-sqrt", "num-traits", @@ -8306,7 +8306,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "parity-scale-codec", "sp-api", @@ -8318,7 +8318,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -8329,7 +8329,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "parity-scale-codec", "sp-api", @@ -8341,7 +8341,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "futures 0.3.12", "log", @@ -8359,7 +8359,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "serde", "serde_json", @@ -8368,7 +8368,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "async-trait", "futures 0.3.12", @@ -8395,7 +8395,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "merlin", "parity-scale-codec", @@ -8415,7 +8415,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -8425,7 +8425,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -8437,7 +8437,7 @@ dependencies = [ [[package]] name = "sp-core" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "base58", "blake2-rfc", @@ -8481,7 +8481,7 @@ dependencies = [ [[package]] name = "sp-database" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -8490,7 +8490,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "proc-macro2", "quote", @@ -8500,7 +8500,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "environmental", "parity-scale-codec", @@ -8511,7 +8511,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "finality-grandpa", "log", @@ -8528,12 +8528,11 @@ dependencies = [ [[package]] name = "sp-inherents" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", - "parking_lot 0.11.1", "sp-core", "sp-runtime", "sp-std", @@ -8543,7 +8542,7 @@ dependencies = [ [[package]] name = "sp-io" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "futures 0.3.12", "hash-db", @@ -8567,7 +8566,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "lazy_static", "sp-core", @@ -8578,7 +8577,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "async-trait", "derive_more", @@ -8595,7 +8594,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "parity-scale-codec", "serde", @@ -8608,7 +8607,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8619,7 +8618,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "sp-api", "sp-core", @@ -8629,7 +8628,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "backtrace", ] @@ -8637,7 +8636,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "serde", "sp-core", @@ -8646,7 +8645,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "either", "hash256-std-hasher", @@ -8667,7 +8666,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8684,7 +8683,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "Inflector", "proc-macro-crate", @@ -8696,7 +8695,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "serde", "serde_json", @@ -8705,7 +8704,7 @@ dependencies = [ [[package]] name = "sp-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "parity-scale-codec", "sp-api", @@ -8718,7 +8717,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -8728,7 +8727,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "hash-db", "log", @@ -8750,12 +8749,12 @@ dependencies = [ [[package]] name = "sp-std" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" [[package]] name = "sp-storage" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8768,7 +8767,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "log", "sp-core", @@ -8781,7 +8780,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "futures-timer 3.0.2", "impl-trait-for-tuples", @@ -8798,7 +8797,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "log", "parity-scale-codec", @@ -8811,7 +8810,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "derive_more", "futures 0.3.12", @@ -8827,7 +8826,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "hash-db", "memory-db", @@ -8841,7 +8840,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "futures 0.3.12", "futures-core", @@ -8853,7 +8852,7 @@ dependencies = [ [[package]] name = "sp-version" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8865,7 +8864,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8997,7 +8996,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "chrono", "console_error_panic_hook", @@ -9024,7 +9023,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "platforms", ] @@ -9032,7 +9031,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.12", @@ -9055,7 +9054,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "async-std", "derive_more", @@ -9069,7 +9068,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "futures 0.1.29", "futures 0.3.12", @@ -9096,7 +9095,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "futures 0.3.12", "substrate-test-utils-derive", @@ -9106,7 +9105,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0c8c197a84811d29de2649bd89e65d5d4703afec" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#0130f985b70e5b9a6579b165111fd447e6d8c6f9" dependencies = [ "proc-macro-crate", "quote", diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index c1b740d5a542..b0d64907c286 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -279,7 +279,7 @@ fn new_partial(config: &mut Configuration, jaeger_agent: O Some(Box::new(justification_import)), client.clone(), select_chain.clone(), - move |_: &sp_runtime::generic::BlockId, ()| async move { + move |_, ()| async move { let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); let slot = @@ -797,13 +797,12 @@ pub fn new_full( block_import, env: proposer, sync_oracle: network.clone(), - inherent_data_providers: move |at: &sp_runtime::generic::BlockId, ()| { + inherent_data_providers: move |parent, ()| { let client_clone = client_clone.clone(); - let at = *at; async move { let uncles = sc_consensus_uncles::create_uncles_inherent_data_provider( &*client_clone, - &at, + parent, )?; let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); @@ -970,7 +969,7 @@ fn new_light(mut config: Configuration) -> Result<( Some(Box::new(justification_import)), client.clone(), select_chain.clone(), - move |_: &sp_runtime::generic::BlockId, ()| async move { + move |_, ()| async move { let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); let slot = From 300f0c9c7556b8aa101f040630344a129f63ddb0 Mon Sep 17 00:00:00 2001 From: Robert Habermeier Date: Thu, 18 Feb 2021 01:05:13 -0600 Subject: [PATCH 04/25] gate approval-checking logic (#2470) --- Cargo.toml | 1 + node/service/Cargo.toml | 4 ++++ node/service/src/grandpa_support.rs | 21 ++++++++++++--------- node/service/src/lib.rs | 9 +++++++++ 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 082631cc62a6..6fd9162ff1c5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -91,6 +91,7 @@ panic = "unwind" [features] runtime-benchmarks=["cli/runtime-benchmarks"] real-overseer=["cli/real-overseer"] +approval-checking=["real-overseer", "service/approval-checking"] # Configuration for building a .deb package - for use with `cargo-deb` [package.metadata.deb] diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index 8b719789c41b..517f206a3010 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -138,3 +138,7 @@ real-overseer = [ "polkadot-approval-distribution", "polkadot-node-core-approval-voting", ] + +approval-checking = [ + "real-overseer" +] diff --git a/node/service/src/grandpa_support.rs b/node/service/src/grandpa_support.rs index d411c8ed817e..6468565a7b3e 100644 --- a/node/service/src/grandpa_support.rs +++ b/node/service/src/grandpa_support.rs @@ -18,17 +18,20 @@ use std::sync::Arc; -use polkadot_primitives::v1::{Block as PolkadotBlock, Header as PolkadotHeader, BlockNumber, Hash}; -use polkadot_subsystem::messages::ApprovalVotingMessage; +use polkadot_primitives::v1::Hash; use sp_runtime::traits::{Block as BlockT, NumberFor}; use sp_runtime::generic::BlockId; use sp_runtime::traits::Header as _; -use prometheus_endpoint::{self, Registry}; -use polkadot_overseer::OverseerHandler; - -use futures::channel::oneshot; +#[cfg(feature = "approval-checking")] +use { + polkadot_primitives::v1::{Block as PolkadotBlock, Header as PolkadotHeader, BlockNumber}, + polkadot_subsystem::messages::ApprovalVotingMessage, + prometheus_endpoint::{self, Registry}, + polkadot_overseer::OverseerHandler, + futures::channel::oneshot, +}; /// A custom GRANDPA voting rule that acts as a diagnostic for the approval /// voting subsystem's desired votes. @@ -36,14 +39,14 @@ use futures::channel::oneshot; /// The practical effect of this voting rule is to implement a fixed delay of /// blocks and to issue a prometheus metric on the lag behind the head that /// approval checking would indicate. -#[cfg(feature = "full-node")] +#[cfg(feature = "approval-checking")] #[derive(Clone)] pub(crate) struct ApprovalCheckingDiagnostic { checking_lag: Option, overseer: OverseerHandler, } -#[cfg(feature = "full-node")] +#[cfg(feature = "approval-checking")] impl ApprovalCheckingDiagnostic { /// Create a new approval checking diagnostic voting rule. pub fn new(overseer: OverseerHandler, registry: Option<&Registry>) @@ -68,7 +71,7 @@ impl ApprovalCheckingDiagnostic { } } -#[cfg(feature = "full-node")] +#[cfg(feature = "approval-checking")] impl grandpa::VotingRule for ApprovalCheckingDiagnostic where B: sp_blockchain::HeaderBackend { diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index b0d64907c286..27304273cbdd 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -427,8 +427,13 @@ where use polkadot_statement_distribution::StatementDistribution as StatementDistributionSubsystem; use polkadot_availability_recovery::AvailabilityRecoverySubsystem; use polkadot_approval_distribution::ApprovalDistribution as ApprovalDistributionSubsystem; + + #[cfg(feature = "approval-checking")] use polkadot_node_core_approval_voting::ApprovalVotingSubsystem; + #[cfg(not(feature = "approval-checking"))] + let _ = slot_duration; // silence. + let all_subsystems = AllSubsystems { availability_distribution: AvailabilityDistributionSubsystem::new( keystore.clone(), @@ -503,11 +508,14 @@ where approval_distribution: ApprovalDistributionSubsystem::new( Metrics::register(registry)?, ), + #[cfg(feature = "approval-checking")] approval_voting: ApprovalVotingSubsystem::new( keystore.clone(), slot_duration, runtime_client.clone(), ), + #[cfg(not(feature = "approval-checking"))] + approval_voting: polkadot_subsystem::DummySubsystem, }; Overseer::new( @@ -865,6 +873,7 @@ pub fn new_full( // given delay. let builder = grandpa::VotingRulesBuilder::default(); + #[cfg(feature = "approval-checking")] let builder = if let Some(ref overseer) = overseer_handler { builder.add(grandpa_support::ApprovalCheckingDiagnostic::new( overseer.clone(), From d07a2b68bd609f6266878001661e18bf0c889718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Sun, 28 Feb 2021 00:06:11 +0100 Subject: [PATCH 05/25] Fix build --- node/service/src/lib.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index bcfab8fe59d1..e63ad75ce607 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -432,13 +432,8 @@ where use polkadot_statement_distribution::StatementDistribution as StatementDistributionSubsystem; use polkadot_availability_recovery::AvailabilityRecoverySubsystem; use polkadot_approval_distribution::ApprovalDistribution as ApprovalDistributionSubsystem; - - #[cfg(feature = "approval-checking")] use polkadot_node_core_approval_voting::ApprovalVotingSubsystem; - #[cfg(not(feature = "approval-checking"))] - let _ = slot_duration; // silence. - let all_subsystems = AllSubsystems { availability_distribution: AvailabilityDistributionSubsystem::new( keystore.clone(), From f415ff77d04d34fb5daa5b7c0b6fbf47ed98568f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 1 Mar 2021 21:34:40 +0100 Subject: [PATCH 06/25] Updates --- Cargo.lock | 290 ++++++++++++++++---------------- runtime/kusama/src/lib.rs | 2 +- runtime/polkadot/src/lib.rs | 2 +- runtime/rococo/src/lib.rs | 2 +- runtime/test-runtime/src/lib.rs | 2 +- runtime/westend/src/lib.rs | 2 +- 6 files changed, 151 insertions(+), 149 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 619fa85d701a..c8cb4e7e0745 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "Inflector" version = "0.11.4" @@ -1594,7 +1596,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "parity-scale-codec", ] @@ -1612,7 +1614,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "3.1.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-support", "frame-system", @@ -1630,7 +1632,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "Inflector", "chrono", @@ -1653,7 +1655,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-support", "frame-system", @@ -1669,7 +1671,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "13.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "parity-scale-codec", "serde", @@ -1680,7 +1682,7 @@ dependencies = [ [[package]] name = "frame-support" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "bitflags", "frame-metadata", @@ -1706,7 +1708,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -1718,7 +1720,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1730,7 +1732,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "proc-macro2", "quote", @@ -1740,7 +1742,7 @@ dependencies = [ [[package]] name = "frame-system" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1756,7 +1758,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-benchmarking", "frame-support", @@ -1770,7 +1772,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "parity-scale-codec", "sp-api", @@ -1779,7 +1781,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-support", "parity-scale-codec", @@ -4020,7 +4022,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b" [[package]] name = "pallet-authority-discovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-support", "frame-system", @@ -4036,7 +4038,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-support", "frame-system", @@ -4051,7 +4053,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-benchmarking", "frame-support", @@ -4075,7 +4077,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-benchmarking", "frame-support", @@ -4089,7 +4091,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-benchmarking", "frame-support", @@ -4104,7 +4106,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-benchmarking", "frame-support", @@ -4120,7 +4122,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-benchmarking", "frame-support", @@ -4135,7 +4137,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-benchmarking", "frame-support", @@ -4155,7 +4157,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-benchmarking", "frame-support", @@ -4170,7 +4172,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-benchmarking", "frame-support", @@ -4191,7 +4193,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4207,7 +4209,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-benchmarking", "frame-support", @@ -4226,7 +4228,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-benchmarking", "frame-support", @@ -4243,7 +4245,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-support", "frame-system", @@ -4257,7 +4259,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-benchmarking", "frame-support", @@ -4273,7 +4275,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-support", "frame-system", @@ -4287,7 +4289,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-support", "frame-system", @@ -4302,7 +4304,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-benchmarking", "frame-support", @@ -4324,7 +4326,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-benchmarking", "frame-support", @@ -4340,7 +4342,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-support", "frame-system", @@ -4353,7 +4355,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "enumflags2", "frame-support", @@ -4368,7 +4370,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-benchmarking", "frame-support", @@ -4383,7 +4385,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-support", "frame-system", @@ -4403,7 +4405,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-benchmarking", "frame-support", @@ -4419,7 +4421,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-support", "frame-system", @@ -4433,7 +4435,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-benchmarking", "frame-support", @@ -4456,7 +4458,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4467,7 +4469,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-support", "frame-system", @@ -4481,7 +4483,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-benchmarking", "frame-support", @@ -4499,7 +4501,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-benchmarking", "frame-support", @@ -4514,7 +4516,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-support", "frame-system", @@ -4530,7 +4532,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4547,7 +4549,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -4558,7 +4560,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-benchmarking", "frame-support", @@ -4574,7 +4576,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-benchmarking", "frame-support", @@ -4590,7 +4592,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "enumflags2", "frame-benchmarking", @@ -6754,7 +6756,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "env_logger 0.8.2", "futures 0.3.12", @@ -7005,7 +7007,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "async-trait", "derive_more", @@ -7033,7 +7035,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -7056,7 +7058,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -7072,7 +7074,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7093,7 +7095,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7104,7 +7106,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "chrono", "fdlimit", @@ -7142,7 +7144,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "derive_more", "fnv", @@ -7176,7 +7178,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "blake2-rfc", "hash-db", @@ -7206,7 +7208,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "sc-client-api", "sp-blockchain", @@ -7217,7 +7219,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "async-trait", "derive_more", @@ -7264,7 +7266,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "derive_more", "futures 0.3.12", @@ -7288,7 +7290,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "fork-tree", "parity-scale-codec", @@ -7301,7 +7303,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -7327,7 +7329,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "sc-client-api", "sp-authorship", @@ -7338,7 +7340,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "derive_more", "lazy_static", @@ -7367,7 +7369,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "derive_more", "parity-scale-codec", @@ -7383,7 +7385,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "log", "parity-scale-codec", @@ -7398,7 +7400,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "log", "parity-scale-codec", @@ -7416,7 +7418,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "derive_more", "dyn-clone", @@ -7455,7 +7457,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "derive_more", "finality-grandpa", @@ -7479,7 +7481,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-warp-sync" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "derive_more", "futures 0.3.12", @@ -7500,7 +7502,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "ansi_term 0.12.1", "futures 0.3.12", @@ -7518,7 +7520,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "async-trait", "derive_more", @@ -7538,7 +7540,7 @@ dependencies = [ [[package]] name = "sc-light" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "hash-db", "lazy_static", @@ -7557,7 +7559,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "async-std", "async-trait", @@ -7610,7 +7612,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -7626,7 +7628,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "bytes 0.5.6", "fnv", @@ -7653,7 +7655,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "futures 0.3.12", "libp2p", @@ -7666,7 +7668,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7675,7 +7677,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "futures 0.3.12", "hash-db", @@ -7709,7 +7711,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "derive_more", "futures 0.3.12", @@ -7733,7 +7735,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "futures 0.1.29", "jsonrpc-core", @@ -7751,7 +7753,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "directories", "exit-future", @@ -7814,7 +7816,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "log", "parity-scale-codec", @@ -7829,7 +7831,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -7849,7 +7851,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "chrono", "futures 0.3.12", @@ -7871,7 +7873,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "ansi_term 0.12.1", "atty", @@ -7899,7 +7901,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7910,7 +7912,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "derive_more", "futures 0.3.12", @@ -7932,7 +7934,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "futures 0.3.12", "futures-diagnose", @@ -8338,7 +8340,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "log", "sp-core", @@ -8350,7 +8352,7 @@ dependencies = [ [[package]] name = "sp-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "hash-db", "parity-scale-codec", @@ -8366,7 +8368,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -8378,7 +8380,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "parity-scale-codec", "serde", @@ -8390,7 +8392,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "integer-sqrt", "num-traits", @@ -8403,7 +8405,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "parity-scale-codec", "sp-api", @@ -8415,7 +8417,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -8426,7 +8428,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "parity-scale-codec", "sp-api", @@ -8438,7 +8440,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "futures 0.3.12", "log", @@ -8456,7 +8458,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "serde", "serde_json", @@ -8465,7 +8467,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "async-trait", "futures 0.3.12", @@ -8492,7 +8494,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "merlin", "parity-scale-codec", @@ -8512,7 +8514,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -8522,7 +8524,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -8534,7 +8536,7 @@ dependencies = [ [[package]] name = "sp-core" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "base58", "blake2-rfc", @@ -8578,7 +8580,7 @@ dependencies = [ [[package]] name = "sp-database" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -8587,7 +8589,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "proc-macro2", "quote", @@ -8597,7 +8599,7 @@ dependencies = [ [[package]] name = "sp-election-providers" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -8608,7 +8610,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "environmental", "parity-scale-codec", @@ -8619,7 +8621,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "finality-grandpa", "log", @@ -8636,7 +8638,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -8650,7 +8652,7 @@ dependencies = [ [[package]] name = "sp-io" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "futures 0.3.12", "hash-db", @@ -8674,7 +8676,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "lazy_static", "sp-core", @@ -8685,7 +8687,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "async-trait", "derive_more", @@ -8702,7 +8704,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "parity-scale-codec", "serde", @@ -8715,7 +8717,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8726,7 +8728,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "sp-api", "sp-core", @@ -8736,7 +8738,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "backtrace", ] @@ -8744,7 +8746,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "serde", "sp-core", @@ -8753,7 +8755,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "either", "hash256-std-hasher", @@ -8774,7 +8776,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8791,7 +8793,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "Inflector", "proc-macro-crate", @@ -8803,7 +8805,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "serde", "serde_json", @@ -8812,7 +8814,7 @@ dependencies = [ [[package]] name = "sp-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "parity-scale-codec", "sp-api", @@ -8825,7 +8827,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -8835,7 +8837,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "hash-db", "log", @@ -8857,12 +8859,12 @@ dependencies = [ [[package]] name = "sp-std" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" [[package]] name = "sp-storage" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8875,7 +8877,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "log", "sp-core", @@ -8888,7 +8890,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "futures-timer 3.0.2", "impl-trait-for-tuples", @@ -8905,7 +8907,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "log", "parity-scale-codec", @@ -8918,7 +8920,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "derive_more", "futures 0.3.12", @@ -8934,7 +8936,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "hash-db", "memory-db", @@ -8948,7 +8950,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "futures 0.3.12", "futures-core", @@ -8960,7 +8962,7 @@ dependencies = [ [[package]] name = "sp-version" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8972,7 +8974,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9104,7 +9106,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "chrono", "console_error_panic_hook", @@ -9131,7 +9133,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "platforms", ] @@ -9139,7 +9141,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.12", @@ -9162,7 +9164,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "async-std", "derive_more", @@ -9176,7 +9178,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "futures 0.1.29", "futures 0.3.12", @@ -9203,7 +9205,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "futures 0.3.12", "substrate-test-utils-derive", @@ -9213,7 +9215,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "proc-macro-crate", "quote", @@ -9896,7 +9898,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] name = "try-runtime-cli" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#8bc49b2e82473733e41f38f87bc5bf9d5b9eaafd" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-inherent-something-future#c5d32dc1b8573c90ba9c01a46c98546368d94885" dependencies = [ "frame-try-runtime", "log", diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index e213624def93..24c98f0f8238 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -1079,7 +1079,7 @@ sp_api::impl_runtime_apis! { } fn execute_block(block: Block) { - Executive::execute_block(block) + Executive::execute_block(block); } fn initialize_block(header: &::Header) { diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 6a86390eb049..67f8ae6316dd 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -1076,7 +1076,7 @@ sp_api::impl_runtime_apis! { } fn execute_block(block: Block) { - Executive::execute_block(block) + Executive::execute_block(block); } fn initialize_block(header: &::Header) { diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index 24986130d2f5..326db9b49c54 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -639,7 +639,7 @@ sp_api::impl_runtime_apis! { } fn execute_block(block: Block) { - Executive::execute_block(block) + Executive::execute_block(block); } fn initialize_block(header: &::Header) { diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index cf522e742257..a4e21b8d3104 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -579,7 +579,7 @@ sp_api::impl_runtime_apis! { } fn execute_block(block: Block) { - Executive::execute_block(block) + Executive::execute_block(block); } fn initialize_block(header: &::Header) { diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index b914d2c819fd..b4dbcb70043b 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -793,7 +793,7 @@ sp_api::impl_runtime_apis! { } fn execute_block(block: Block) { - Executive::execute_block(block) + Executive::execute_block(block); } fn initialize_block(header: &::Header) { From cf8eaff5d9dbfca48bdb75b491789a3a75395b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Tue, 16 Mar 2021 14:53:52 +0100 Subject: [PATCH 07/25] Fix merge --- Cargo.lock | 879 +++--------------- bridges/bin/millau/node/Cargo.toml | 28 - bridges/bin/millau/runtime/Cargo.toml | 28 - bridges/bin/rialto/node/Cargo.toml | 29 - bridges/bin/rialto/runtime/Cargo.toml | 30 - bridges/bin/runtime-common/Cargo.toml | 9 - bridges/modules/call-dispatch/Cargo.toml | 11 - bridges/modules/currency-exchange/Cargo.toml | 12 - .../ethereum-contract/builtin/Cargo.toml | 10 - bridges/modules/ethereum/Cargo.toml | 9 - bridges/modules/finality-verifier/Cargo.toml | 12 - bridges/modules/message-lane/Cargo.toml | 14 - bridges/modules/message-lane/rpc/Cargo.toml | 9 - .../modules/shift-session-manager/Cargo.toml | 12 - bridges/modules/substrate/Cargo.toml | 15 - .../primitives/currency-exchange/Cargo.toml | 6 - bridges/primitives/ethereum-poa/Cargo.toml | 7 - bridges/primitives/header-chain/Cargo.toml | 8 - bridges/primitives/kusama/Cargo.toml | 9 - bridges/primitives/message-lane/Cargo.toml | 6 - bridges/primitives/millau/Cargo.toml | 11 - bridges/primitives/polkadot/Cargo.toml | 9 - bridges/primitives/rialto/Cargo.toml | 9 - bridges/primitives/runtime/Cargo.toml | 8 - bridges/primitives/test-utils/Cargo.toml | 6 - bridges/relays/ethereum/Cargo.toml | 9 - bridges/relays/kusama-client/Cargo.toml | 9 - bridges/relays/millau-client/Cargo.toml | 9 - bridges/relays/polkadot-client/Cargo.toml | 9 - bridges/relays/rialto-client/Cargo.toml | 9 - bridges/relays/substrate-client/Cargo.toml | 12 - bridges/relays/substrate/Cargo.toml | 8 - bridges/relays/utils/Cargo.toml | 4 - node/core/proposer/Cargo.toml | 15 - node/service/src/lib.rs | 16 - runtime/common/Cargo.toml | 14 +- runtime/parachains/Cargo.toml | 11 - 37 files changed, 151 insertions(+), 1160 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8a229046bfc1..1ce3edcaec2f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1648,11 +1648,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "parity-scale-codec", ] @@ -1670,11 +1666,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "3.1.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-support", "frame-system", @@ -1693,11 +1685,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "3.0.0" -<<<<<<< HEAD source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master dependencies = [ "Inflector", "chrono", @@ -1720,11 +1708,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-support", "frame-system", @@ -1740,11 +1724,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "13.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "parity-scale-codec", "serde", @@ -1755,11 +1735,7 @@ dependencies = [ [[package]] name = "frame-support" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "bitflags", "frame-metadata", @@ -1785,11 +1761,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -1801,11 +1773,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.0.0", @@ -1817,11 +1785,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "proc-macro2", "quote", @@ -1831,7 +1795,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-metadata", "frame-support", @@ -1852,11 +1816,7 @@ dependencies = [ [[package]] name = "frame-system" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1873,11 +1833,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-benchmarking", "frame-support", @@ -1891,11 +1847,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "parity-scale-codec", "sp-api", @@ -1904,11 +1856,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-support", "parity-scale-codec", @@ -4210,11 +4158,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b" [[package]] name = "pallet-authority-discovery" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-support", "frame-system", @@ -4230,11 +4174,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-support", "frame-system", @@ -4249,11 +4189,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4272,17 +4208,12 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", - "sp-timestamp", ] [[package]] name = "pallet-balances" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4297,11 +4228,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4316,11 +4243,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4337,11 +4260,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4356,11 +4275,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4381,11 +4296,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4401,11 +4312,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4427,11 +4334,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4447,11 +4350,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4471,11 +4370,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4492,11 +4387,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-support", "frame-system", @@ -4510,11 +4401,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4530,11 +4417,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-support", "frame-system", @@ -4548,11 +4431,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-support", "frame-system", @@ -4568,11 +4447,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4594,11 +4469,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4614,11 +4485,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-support", "frame-system", @@ -4631,11 +4498,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "enumflags2", "frame-support", @@ -4650,11 +4513,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4670,11 +4529,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-support", "frame-system", @@ -4694,11 +4549,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4714,11 +4565,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-support", "frame-system", @@ -4732,11 +4579,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4760,11 +4603,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -4775,11 +4614,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-support", "frame-system", @@ -4793,11 +4628,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4816,11 +4647,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4835,11 +4662,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-support", "frame-system", @@ -4855,11 +4678,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4876,11 +4695,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -4891,11 +4706,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4911,11 +4722,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4931,11 +4738,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5776,7 +5579,6 @@ dependencies = [ "sc-basic-authorship", "sc-block-builder", "sc-client-api", - "sc-telemetry", "sp-api", "sp-blockchain", "sp-consensus", @@ -6229,7 +6031,6 @@ dependencies = [ "derive_more", "frame-benchmarking", "frame-support", - "frame-support-test", "frame-system", "futures 0.3.12", "hex-literal", @@ -7130,11 +6931,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "env_logger 0.8.2", "hex-literal", @@ -7390,11 +7187,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "async-trait", "derive_more", @@ -7422,11 +7215,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -7449,11 +7238,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -7469,11 +7254,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7494,11 +7275,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -7509,11 +7286,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "chrono", "fdlimit", @@ -7551,11 +7324,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "derive_more", "fnv", @@ -7589,11 +7358,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "blake2-rfc", "hash-db", @@ -7623,11 +7388,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "sc-client-api", "sp-blockchain", @@ -7638,11 +7399,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "async-trait", "derive_more", @@ -7689,11 +7446,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "derive_more", "futures 0.3.12", @@ -7717,11 +7470,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "fork-tree", "parity-scale-codec", @@ -7734,14 +7483,11 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", + "impl-trait-for-tuples", "log", "parity-scale-codec", "parking_lot 0.11.1", @@ -7757,6 +7503,7 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", + "sp-timestamp", "sp-trie", "thiserror", ] @@ -7764,11 +7511,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "sc-client-api", "sp-authorship", @@ -7779,11 +7522,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "derive_more", "lazy_static", @@ -7812,11 +7551,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "derive_more", "parity-scale-codec", @@ -7832,11 +7567,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "log", "parity-scale-codec", @@ -7851,11 +7582,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "log", "parity-scale-codec", @@ -7873,11 +7600,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "derive_more", "dyn-clone", @@ -7916,11 +7639,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "derive_more", "finality-grandpa", @@ -7944,11 +7663,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-warp-sync" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "derive_more", "futures 0.3.12", @@ -7969,11 +7684,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "ansi_term 0.12.1", "futures 0.3.12", @@ -7991,11 +7702,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "async-trait", "derive_more", @@ -8015,11 +7722,7 @@ dependencies = [ [[package]] name = "sc-light" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "hash-db", "lazy_static", @@ -8038,11 +7741,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "async-std", "async-trait", @@ -8095,11 +7794,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -8115,11 +7810,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "bytes 0.5.6", "fnv", @@ -8147,11 +7838,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "futures 0.3.12", "libp2p", @@ -8164,11 +7851,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8177,11 +7860,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "futures 0.3.12", "hash-db", @@ -8215,11 +7894,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "derive_more", "futures 0.3.12", @@ -8243,11 +7918,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "futures 0.1.29", "jsonrpc-core", @@ -8265,11 +7936,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "directories", "exit-future", @@ -8332,11 +7999,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "log", "parity-scale-codec", @@ -8351,11 +8014,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -8375,11 +8034,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "chrono", "futures 0.3.12", @@ -8399,11 +8054,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "ansi_term 0.12.1", "atty", @@ -8430,11 +8081,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -8445,11 +8092,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "derive_more", "futures 0.3.12", @@ -8471,11 +8114,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "futures 0.3.12", "futures-diagnose", @@ -8881,11 +8520,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "log", "sp-core", @@ -8897,11 +8532,7 @@ dependencies = [ [[package]] name = "sp-api" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "hash-db", "log", @@ -8918,11 +8549,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "blake2-rfc", "proc-macro-crate 1.0.0", @@ -8934,11 +8561,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "parity-scale-codec", "serde", @@ -8950,11 +8573,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "integer-sqrt", "num-traits", @@ -8967,11 +8586,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "parity-scale-codec", "sp-api", @@ -8983,11 +8598,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -8998,11 +8609,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "parity-scale-codec", "sp-api", @@ -9014,11 +8621,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "futures 0.3.12", "log", @@ -9036,11 +8639,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "serde", "serde_json", @@ -9049,11 +8648,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "async-trait", "futures 0.3.12", @@ -9080,11 +8675,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "merlin", "parity-scale-codec", @@ -9099,17 +8690,12 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-std", - "sp-timestamp", ] [[package]] name = "sp-consensus-slots" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -9119,11 +8705,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -9135,11 +8717,7 @@ dependencies = [ [[package]] name = "sp-core" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "base58", "blake2-rfc", @@ -9183,11 +8761,7 @@ dependencies = [ [[package]] name = "sp-database" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -9196,11 +8770,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "proc-macro2", "quote", @@ -9210,11 +8780,7 @@ dependencies = [ [[package]] name = "sp-election-providers" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -9225,11 +8791,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "environmental", "parity-scale-codec", @@ -9240,11 +8802,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "finality-grandpa", "log", @@ -9261,11 +8819,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -9279,11 +8833,7 @@ dependencies = [ [[package]] name = "sp-io" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "futures 0.3.12", "hash-db", @@ -9307,11 +8857,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "lazy_static", "sp-core", @@ -9322,11 +8868,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "async-trait", "derive_more", @@ -9343,11 +8885,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "parity-scale-codec", "serde", @@ -9360,11 +8898,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -9375,11 +8909,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "sp-api", "sp-core", @@ -9389,11 +8919,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "backtrace", ] @@ -9401,11 +8927,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "serde", "sp-core", @@ -9414,11 +8936,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "either", "hash256-std-hasher", @@ -9439,11 +8957,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9460,11 +8974,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", @@ -9476,11 +8986,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "serde", "serde_json", @@ -9489,11 +8995,7 @@ dependencies = [ [[package]] name = "sp-session" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "parity-scale-codec", "sp-api", @@ -9506,11 +9008,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -9520,11 +9018,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "hash-db", "log", @@ -9546,20 +9040,12 @@ dependencies = [ [[package]] name = "sp-std" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" [[package]] name = "sp-storage" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9572,11 +9058,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "log", "sp-core", @@ -9589,14 +9071,9 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "futures-timer 3.0.2", - "impl-trait-for-tuples", "log", "parity-scale-codec", "sp-api", @@ -9610,11 +9087,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "log", "parity-scale-codec", @@ -9627,11 +9100,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "derive_more", "futures 0.3.12", @@ -9647,11 +9116,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "hash-db", "memory-db", @@ -9665,11 +9130,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "futures 0.3.12", "futures-core", @@ -9681,11 +9142,7 @@ dependencies = [ [[package]] name = "sp-version" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9697,11 +9154,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9833,11 +9286,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "chrono", "console_error_panic_hook", @@ -9863,11 +9312,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "platforms", ] @@ -9875,11 +9320,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.12", @@ -9902,11 +9343,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "async-std", "derive_more", @@ -9920,11 +9357,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "futures 0.1.29", "futures 0.3.12", @@ -9952,11 +9385,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "3.0.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "futures 0.3.12", "substrate-test-utils-derive", @@ -9966,11 +9395,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "proc-macro-crate 1.0.0", "quote", @@ -10522,9 +9947,9 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" [[package]] name = "tracing" -version = "0.1.22" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" +checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f" dependencies = [ "cfg-if 1.0.0", "log", @@ -10535,9 +9960,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.11" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada" +checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2" dependencies = [ "proc-macro2", "quote", @@ -10653,11 +10078,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] name = "try-runtime-cli" version = "0.9.0" -<<<<<<< HEAD -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#5fe929aba2c2e5dd2c644e5de59711d77d7a2088" -======= -source = "git+https://github.com/paritytech/substrate#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" ->>>>>>> origin/master +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#d3f06834451008cf2427aea6d91e8116ce281ca4" dependencies = [ "frame-try-runtime", "log", diff --git a/bridges/bin/millau/node/Cargo.toml b/bridges/bin/millau/node/Cargo.toml index e3db9a4e4563..554b6d1bab58 100644 --- a/bridges/bin/millau/node/Cargo.toml +++ b/bridges/bin/millau/node/Cargo.toml @@ -24,7 +24,6 @@ pallet-message-lane-rpc = { path = "../../../modules/message-lane/rpc" } # Substrate Dependencies -<<<<<<< HEAD frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sc-basic-authorship = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } @@ -50,33 +49,6 @@ substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate.gi [build-dependencies] build-script-utils = { package = "substrate-build-script-utils", version = "2.0" } frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } -======= -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["wasmtime"] } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "master" } - -[build-dependencies] -build-script-utils = { package = "substrate-build-script-utils", version = "2.0" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master vergen = "3.1.0" [features] diff --git a/bridges/bin/millau/runtime/Cargo.toml b/bridges/bin/millau/runtime/Cargo.toml index 746176e19383..3da644ef5c6d 100644 --- a/bridges/bin/millau/runtime/Cargo.toml +++ b/bridges/bin/millau/runtime/Cargo.toml @@ -28,7 +28,6 @@ pallet-substrate-bridge = { path = "../../../modules/substrate", default-feature # Substrate Dependencies -<<<<<<< HEAD frame-executive = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } frame-system = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } @@ -54,33 +53,6 @@ sp-std = { git = "https://github.com/paritytech/substrate.git", default-features sp-transaction-pool = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-trie = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-version = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } -======= -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } ->>>>>>> origin/master [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "2.0.0" } diff --git a/bridges/bin/rialto/node/Cargo.toml b/bridges/bin/rialto/node/Cargo.toml index 68b5fa565717..3dc7f2d5451d 100644 --- a/bridges/bin/rialto/node/Cargo.toml +++ b/bridges/bin/rialto/node/Cargo.toml @@ -24,7 +24,6 @@ rialto-runtime = { path = "../runtime" } # Substrate Dependencies -<<<<<<< HEAD frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sc-basic-authorship = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } @@ -51,34 +50,6 @@ substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate.gi [build-dependencies] build-script-utils = { package = "substrate-build-script-utils", version = "2.0" } frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } -======= -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["wasmtime"] } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "master" } - -[build-dependencies] -build-script-utils = { package = "substrate-build-script-utils", version = "2.0" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master vergen = "3.1.0" [features] diff --git a/bridges/bin/rialto/runtime/Cargo.toml b/bridges/bin/rialto/runtime/Cargo.toml index 0bd99247c2db..90450e4ec0e1 100644 --- a/bridges/bin/rialto/runtime/Cargo.toml +++ b/bridges/bin/rialto/runtime/Cargo.toml @@ -34,7 +34,6 @@ pallet-shift-session-manager = { path = "../../../modules/shift-session-manager" # Substrate Dependencies -<<<<<<< HEAD frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", default-features = false, optional = true , branch = "bkchr-inherent-something-future" } frame-executive = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } @@ -62,35 +61,6 @@ sp-std = { git = "https://github.com/paritytech/substrate.git", default-features sp-transaction-pool = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-trie = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-version = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } -======= -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } ->>>>>>> origin/master [dev-dependencies] libsecp256k1 = { version = "0.3.4", features = ["hmac"] } diff --git a/bridges/bin/runtime-common/Cargo.toml b/bridges/bin/runtime-common/Cargo.toml index c672b59dedaa..2825eea55d6a 100644 --- a/bridges/bin/runtime-common/Cargo.toml +++ b/bridges/bin/runtime-common/Cargo.toml @@ -23,21 +23,12 @@ pallet-substrate-bridge = { path = "../../modules/substrate", default-features = # Substrate dependencies -<<<<<<< HEAD frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-core = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-runtime = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-state-machine = { git = "https://github.com/paritytech/substrate.git", default-features = false, optional = true , branch = "bkchr-inherent-something-future" } sp-std = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-trie = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } -======= -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } ->>>>>>> origin/master [features] default = ["std"] diff --git a/bridges/modules/call-dispatch/Cargo.toml b/bridges/modules/call-dispatch/Cargo.toml index e51d7b3e7bc5..4c6693d5e18f 100644 --- a/bridges/modules/call-dispatch/Cargo.toml +++ b/bridges/modules/call-dispatch/Cargo.toml @@ -16,7 +16,6 @@ bp-runtime = { path = "../../primitives/runtime", default-features = false } # Substrate Dependencies -<<<<<<< HEAD frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } frame-system = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-core = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } @@ -25,16 +24,6 @@ sp-runtime = { git = "https://github.com/paritytech/substrate.git", default-feat [dev-dependencies] sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } -======= -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } - -[dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master serde = "1.0" [features] diff --git a/bridges/modules/currency-exchange/Cargo.toml b/bridges/modules/currency-exchange/Cargo.toml index 047f2472060d..2f03db25bf02 100644 --- a/bridges/modules/currency-exchange/Cargo.toml +++ b/bridges/modules/currency-exchange/Cargo.toml @@ -17,7 +17,6 @@ bp-header-chain = { path = "../../primitives/header-chain", default-features = f # Substrate Dependencies -<<<<<<< HEAD frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", default-features = false, optional = true , branch = "bkchr-inherent-something-future" } frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } frame-system = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } @@ -27,17 +26,6 @@ sp-std = { git = "https://github.com/paritytech/substrate.git", default-features [dev-dependencies] sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } -======= -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true } - -[dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master [features] default = ["std"] diff --git a/bridges/modules/ethereum-contract/builtin/Cargo.toml b/bridges/modules/ethereum-contract/builtin/Cargo.toml index f03482b25ae8..f8e28538fa5b 100644 --- a/bridges/modules/ethereum-contract/builtin/Cargo.toml +++ b/bridges/modules/ethereum-contract/builtin/Cargo.toml @@ -19,7 +19,6 @@ rialto-runtime = { path = "../../../bin/rialto/runtime" } # Substrate Dependencies -<<<<<<< HEAD sc-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } @@ -27,12 +26,3 @@ sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "bk [dev-dependencies] sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } -======= -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } - -[dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master diff --git a/bridges/modules/ethereum/Cargo.toml b/bridges/modules/ethereum/Cargo.toml index 08f3656bd2a8..a7641a52eda4 100644 --- a/bridges/modules/ethereum/Cargo.toml +++ b/bridges/modules/ethereum/Cargo.toml @@ -17,21 +17,12 @@ bp-eth-poa = { path = "../../primitives/ethereum-poa", default-features = false # Substrate Dependencies -<<<<<<< HEAD frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", default-features = false, optional = true , branch = "bkchr-inherent-something-future" } frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } frame-system = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-io = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-runtime = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-std = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } -======= -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } ->>>>>>> origin/master [dev-dependencies] libsecp256k1 = { version = "0.3.4", features = ["hmac"] } diff --git a/bridges/modules/finality-verifier/Cargo.toml b/bridges/modules/finality-verifier/Cargo.toml index 5c97f3f182c4..935c7c400389 100644 --- a/bridges/modules/finality-verifier/Cargo.toml +++ b/bridges/modules/finality-verifier/Cargo.toml @@ -19,27 +19,15 @@ bp-header-chain = { path = "../../primitives/header-chain", default-features = f # Substrate Dependencies -<<<<<<< HEAD frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } frame-system = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-runtime = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-std = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } -======= -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } ->>>>>>> origin/master [dev-dependencies] bp-test-utils = {path = "../../primitives/test-utils" } pallet-substrate-bridge = { path = "../../modules/substrate" } -<<<<<<< HEAD sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } -======= -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master - [features] default = ["std"] diff --git a/bridges/modules/message-lane/Cargo.toml b/bridges/modules/message-lane/Cargo.toml index 512e35ced48f..715485979fbf 100644 --- a/bridges/modules/message-lane/Cargo.toml +++ b/bridges/modules/message-lane/Cargo.toml @@ -19,7 +19,6 @@ bp-runtime = { path = "../../primitives/runtime", default-features = false } # Substrate Dependencies -<<<<<<< HEAD frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", default-features = false, optional = true , branch = "bkchr-inherent-something-future" } frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } frame-system = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } @@ -31,19 +30,6 @@ sp-std = { git = "https://github.com/paritytech/substrate.git", default-features hex-literal = "0.3" sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } -======= -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } - -[dev-dependencies] -hex-literal = "0.3" -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master [features] default = ["std"] diff --git a/bridges/modules/message-lane/rpc/Cargo.toml b/bridges/modules/message-lane/rpc/Cargo.toml index 574b9019ae72..ec6f7cc736a9 100644 --- a/bridges/modules/message-lane/rpc/Cargo.toml +++ b/bridges/modules/message-lane/rpc/Cargo.toml @@ -21,18 +21,9 @@ bp-message-lane = { path = "../../../primitives/message-lane" } # Substrate Dependencies -<<<<<<< HEAD sc-client-api = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-state-machine = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-trie = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } -======= -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master diff --git a/bridges/modules/shift-session-manager/Cargo.toml b/bridges/modules/shift-session-manager/Cargo.toml index ad8132fe3ee6..99e6e5b37151 100644 --- a/bridges/modules/shift-session-manager/Cargo.toml +++ b/bridges/modules/shift-session-manager/Cargo.toml @@ -11,7 +11,6 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features = # Substrate Dependencies -<<<<<<< HEAD frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } frame-system = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } pallet-session = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } @@ -21,17 +20,6 @@ sp-std = { git = "https://github.com/paritytech/substrate.git", default-features [dev-dependencies] sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } -======= -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } - -[dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master serde = "1.0" [features] diff --git a/bridges/modules/substrate/Cargo.toml b/bridges/modules/substrate/Cargo.toml index fb2108869309..230bdbe1085e 100644 --- a/bridges/modules/substrate/Cargo.toml +++ b/bridges/modules/substrate/Cargo.toml @@ -20,7 +20,6 @@ bp-runtime = { path = "../../primitives/runtime", default-features = false } # Substrate Dependencies -<<<<<<< HEAD frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } frame-system = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } @@ -33,20 +32,6 @@ bp-test-utils = {path = "../../primitives/test-utils" } sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-state-machine = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } -======= -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } - -[dev-dependencies] -bp-test-utils = {path = "../../primitives/test-utils" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master [features] default = ["std"] diff --git a/bridges/primitives/currency-exchange/Cargo.toml b/bridges/primitives/currency-exchange/Cargo.toml index 549724a0f2a9..642432dcc2fa 100644 --- a/bridges/primitives/currency-exchange/Cargo.toml +++ b/bridges/primitives/currency-exchange/Cargo.toml @@ -11,15 +11,9 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features = # Substrate Dependencies -<<<<<<< HEAD frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-api = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-std = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } -======= -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } ->>>>>>> origin/master [features] default = ["std"] diff --git a/bridges/primitives/ethereum-poa/Cargo.toml b/bridges/primitives/ethereum-poa/Cargo.toml index 8169c728724b..f1c6c07c2770 100644 --- a/bridges/primitives/ethereum-poa/Cargo.toml +++ b/bridges/primitives/ethereum-poa/Cargo.toml @@ -24,17 +24,10 @@ triehash = { version = "0.8.2", default-features = false } # Substrate Dependencies -<<<<<<< HEAD sp-api = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-io = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-runtime = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-std = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } -======= -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } ->>>>>>> origin/master [dev-dependencies] hex-literal = "0.2" diff --git a/bridges/primitives/header-chain/Cargo.toml b/bridges/primitives/header-chain/Cargo.toml index c79d84b4eb40..deaf9d8b5b5d 100644 --- a/bridges/primitives/header-chain/Cargo.toml +++ b/bridges/primitives/header-chain/Cargo.toml @@ -13,19 +13,11 @@ serde = { version = "1.0", optional = true } # Substrate Dependencies -<<<<<<< HEAD frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-core = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-runtime = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-std = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } -======= -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } ->>>>>>> origin/master [dev-dependencies] bp-test-utils = { path = "../test-utils" } diff --git a/bridges/primitives/kusama/Cargo.toml b/bridges/primitives/kusama/Cargo.toml index 4090c6cbab11..008a9dca0081 100644 --- a/bridges/primitives/kusama/Cargo.toml +++ b/bridges/primitives/kusama/Cargo.toml @@ -15,21 +15,12 @@ bp-runtime = { path = "../runtime", default-features = false } # Substrate Based Dependencies -<<<<<<< HEAD frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } frame-system = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-api = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-core = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-runtime = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-std = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } -======= -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } ->>>>>>> origin/master [features] default = ["std"] diff --git a/bridges/primitives/message-lane/Cargo.toml b/bridges/primitives/message-lane/Cargo.toml index 600f959c522f..e5538e76e924 100644 --- a/bridges/primitives/message-lane/Cargo.toml +++ b/bridges/primitives/message-lane/Cargo.toml @@ -15,15 +15,9 @@ bp-runtime = { path = "../runtime", default-features = false } # Substrate Dependencies -<<<<<<< HEAD frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } frame-system = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-std = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } -======= -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } ->>>>>>> origin/master [features] default = ["std"] diff --git a/bridges/primitives/millau/Cargo.toml b/bridges/primitives/millau/Cargo.toml index 41f38f0ab610..5ba63e37ec79 100644 --- a/bridges/primitives/millau/Cargo.toml +++ b/bridges/primitives/millau/Cargo.toml @@ -21,7 +21,6 @@ serde = { version = "1.0.101", optional = true, features = ["derive"] } # Substrate Based Dependencies -<<<<<<< HEAD frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } frame-system = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-api = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } @@ -30,16 +29,6 @@ sp-io = { git = "https://github.com/paritytech/substrate.git", default-features sp-runtime = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-std = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-trie = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } -======= -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } ->>>>>>> origin/master [features] default = ["std"] diff --git a/bridges/primitives/polkadot/Cargo.toml b/bridges/primitives/polkadot/Cargo.toml index db58ad4f3e4e..8c51bc4e9609 100644 --- a/bridges/primitives/polkadot/Cargo.toml +++ b/bridges/primitives/polkadot/Cargo.toml @@ -15,21 +15,12 @@ bp-runtime = { path = "../runtime", default-features = false } # Substrate Based Dependencies -<<<<<<< HEAD frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } frame-system = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-api = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-core = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-runtime = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-std = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } -======= -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } ->>>>>>> origin/master [features] default = ["std"] diff --git a/bridges/primitives/rialto/Cargo.toml b/bridges/primitives/rialto/Cargo.toml index 19f72bce45e7..de32ec99cb93 100644 --- a/bridges/primitives/rialto/Cargo.toml +++ b/bridges/primitives/rialto/Cargo.toml @@ -15,21 +15,12 @@ bp-runtime = { path = "../runtime", default-features = false } # Substrate Based Dependencies -<<<<<<< HEAD frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } frame-system = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-api = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-core = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-runtime = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-std = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } -======= -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } ->>>>>>> origin/master [features] default = ["std"] diff --git a/bridges/primitives/runtime/Cargo.toml b/bridges/primitives/runtime/Cargo.toml index f2ba418834db..fd92f8085531 100644 --- a/bridges/primitives/runtime/Cargo.toml +++ b/bridges/primitives/runtime/Cargo.toml @@ -12,19 +12,11 @@ num-traits = { version = "0.2", default-features = false } # Substrate Dependencies -<<<<<<< HEAD frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-core = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-io = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-runtime = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } sp-std = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "bkchr-inherent-something-future" } -======= -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } ->>>>>>> origin/master [features] default = ["std"] diff --git a/bridges/primitives/test-utils/Cargo.toml b/bridges/primitives/test-utils/Cargo.toml index 9c5e79844f15..9bc90b9b6a33 100644 --- a/bridges/primitives/test-utils/Cargo.toml +++ b/bridges/primitives/test-utils/Cargo.toml @@ -8,12 +8,6 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] finality-grandpa = { version = "0.14.0" } bp-header-chain = { path = "../header-chain" } -<<<<<<< HEAD sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } -======= -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master diff --git a/bridges/relays/ethereum/Cargo.toml b/bridges/relays/ethereum/Cargo.toml index fdc14c21d3e7..47b02440e5b8 100644 --- a/bridges/relays/ethereum/Cargo.toml +++ b/bridges/relays/ethereum/Cargo.toml @@ -40,18 +40,9 @@ rialto-runtime = { path = "../../bin/rialto/runtime" } # Substrate Dependencies -<<<<<<< HEAD frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } pallet-transaction-payment = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } -======= -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master diff --git a/bridges/relays/kusama-client/Cargo.toml b/bridges/relays/kusama-client/Cargo.toml index 9a01244c7e19..532c71d3b7da 100644 --- a/bridges/relays/kusama-client/Cargo.toml +++ b/bridges/relays/kusama-client/Cargo.toml @@ -17,18 +17,9 @@ bp-kusama = { path = "../../primitives/kusama" } # Substrate Dependencies -<<<<<<< HEAD frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } pallet-transaction-payment = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } -======= -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master diff --git a/bridges/relays/millau-client/Cargo.toml b/bridges/relays/millau-client/Cargo.toml index 0651f05af12b..f3e71a9d0437 100644 --- a/bridges/relays/millau-client/Cargo.toml +++ b/bridges/relays/millau-client/Cargo.toml @@ -17,18 +17,9 @@ millau-runtime = { path = "../../bin/millau/runtime" } # Substrate Dependencies -<<<<<<< HEAD frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } pallet-transaction-payment = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } -======= -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master diff --git a/bridges/relays/polkadot-client/Cargo.toml b/bridges/relays/polkadot-client/Cargo.toml index a014d0974c13..e0569deddd1b 100644 --- a/bridges/relays/polkadot-client/Cargo.toml +++ b/bridges/relays/polkadot-client/Cargo.toml @@ -17,18 +17,9 @@ bp-polkadot = { path = "../../primitives/polkadot" } # Substrate Dependencies -<<<<<<< HEAD frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } pallet-transaction-payment = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } -======= -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master diff --git a/bridges/relays/rialto-client/Cargo.toml b/bridges/relays/rialto-client/Cargo.toml index dd9fa42a1b07..be0a6327173e 100644 --- a/bridges/relays/rialto-client/Cargo.toml +++ b/bridges/relays/rialto-client/Cargo.toml @@ -17,18 +17,9 @@ rialto-runtime = { path = "../../bin/rialto/runtime" } # Substrate Dependencies -<<<<<<< HEAD frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } pallet-transaction-payment = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } -======= -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master diff --git a/bridges/relays/substrate-client/Cargo.toml b/bridges/relays/substrate-client/Cargo.toml index a41693ee5f3e..8c3763246d11 100644 --- a/bridges/relays/substrate-client/Cargo.toml +++ b/bridges/relays/substrate-client/Cargo.toml @@ -23,7 +23,6 @@ relay-utils = { path = "../utils" } # Substrate Dependencies -<<<<<<< HEAD frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } @@ -33,17 +32,6 @@ sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "bk sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-trie = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-version = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } -======= -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master #[dev-dependencies] futures = "0.3.7" diff --git a/bridges/relays/substrate/Cargo.toml b/bridges/relays/substrate/Cargo.toml index f1a6914176e3..ed84cf129320 100644 --- a/bridges/relays/substrate/Cargo.toml +++ b/bridges/relays/substrate/Cargo.toml @@ -42,16 +42,8 @@ rialto-runtime = { path = "../../bin/rialto/runtime" } # Substrate Dependencies -<<<<<<< HEAD frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } sp-trie = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } -======= -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master diff --git a/bridges/relays/utils/Cargo.toml b/bridges/relays/utils/Cargo.toml index 94739868350c..c55a499cf971 100644 --- a/bridges/relays/utils/Cargo.toml +++ b/bridges/relays/utils/Cargo.toml @@ -19,8 +19,4 @@ time = "0.2" # Substrate dependencies -<<<<<<< HEAD substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate.git", branch = "bkchr-inherent-something-future" } -======= -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master diff --git a/node/core/proposer/Cargo.toml b/node/core/proposer/Cargo.toml index b98a5b5e0496..c54269ad3236 100644 --- a/node/core/proposer/Cargo.toml +++ b/node/core/proposer/Cargo.toml @@ -11,7 +11,6 @@ tracing = "0.1.22" polkadot-node-subsystem = { path = "../../subsystem" } polkadot-overseer = { path = "../../overseer" } polkadot-primitives = { path = "../../../primitives" } -<<<<<<< HEAD sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } @@ -23,17 +22,3 @@ sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "bkch sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } -======= -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index ea64674bf7fe..1f1014f9c6c0 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -246,10 +246,6 @@ fn new_partial( set_prometheus_registry(config)?; -<<<<<<< HEAD -======= - let inherent_data_providers = inherents::InherentDataProviders::new(); - let telemetry = config.telemetry_endpoints.clone() .filter(|x| !x.is_empty()) .map(move |endpoints| -> Result<_, telemetry::Error> { @@ -265,7 +261,6 @@ fn new_partial( }) .transpose()?; ->>>>>>> origin/master let (client, backend, keystore_container, task_manager) = service::new_full_parts::( &config, @@ -402,12 +397,7 @@ fn new_partial( select_chain, import_queue, transaction_pool, -<<<<<<< HEAD - other: (rpc_extensions_builder, import_setup, rpc_setup, slot_duration) -======= - inherent_data_providers, other: (rpc_extensions_builder, import_setup, rpc_setup, slot_duration, telemetry) ->>>>>>> origin/master }) } @@ -658,14 +648,8 @@ pub fn new_full( select_chain, import_queue, transaction_pool, -<<<<<<< HEAD - other: (rpc_extensions_builder, import_setup, rpc_setup, slot_duration) - } = new_partial::(&mut config, jaeger_agent)?; -======= - inherent_data_providers, other: (rpc_extensions_builder, import_setup, rpc_setup, slot_duration, mut telemetry) } = new_partial::(&mut config, jaeger_agent, telemetry_worker_handle)?; ->>>>>>> origin/master let prometheus_registry = config.prometheus_registry().cloned(); diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index ca715895466f..a7e49f6d24e6 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -43,28 +43,16 @@ xcm = { path = "../../xcm", default-features = false } [dev-dependencies] hex-literal = "0.3.1" -<<<<<<< HEAD keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } sp-trie = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } sp-election-providers = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +frame-support-test = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } -======= -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-election-providers = { git = "https://github.com/paritytech/substrate", branch = "master" } -frame-support-test = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master trie-db = "0.22.3" serde_json = "1.0.61" libsecp256k1 = "0.3.5" diff --git a/runtime/parachains/Cargo.toml b/runtime/parachains/Cargo.toml index 858937dfc111..bd0b5942fcfa 100644 --- a/runtime/parachains/Cargo.toml +++ b/runtime/parachains/Cargo.toml @@ -45,7 +45,6 @@ rand_chacha = { version = "0.3.0", default-features = false } [dev-dependencies] futures = "0.3.12" hex-literal = "0.3.1" -<<<<<<< HEAD keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } sp-trie = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } @@ -53,16 +52,6 @@ sp-application-crypto = { git = "https://github.com/paritytech/substrate", branc pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } -======= -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } -frame-support-test = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master" } ->>>>>>> origin/master serde_json = "1.0.61" libsecp256k1 = "0.3.5" sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "bkchr-inherent-something-future" } From a7b26f8c49918500c8254adaa785feafc83805ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Tue, 16 Mar 2021 17:00:58 +0100 Subject: [PATCH 08/25] Adds missing crate --- Cargo.lock | 1 + node/core/proposer/Cargo.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 1ce3edcaec2f..8238d24e3837 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5579,6 +5579,7 @@ dependencies = [ "sc-basic-authorship", "sc-block-builder", "sc-client-api", + "sc-telemetry", "sp-api", "sp-blockchain", "sp-consensus", diff --git a/node/core/proposer/Cargo.toml b/node/core/proposer/Cargo.toml index c54269ad3236..a0a49b1a4c3f 100644 --- a/node/core/proposer/Cargo.toml +++ b/node/core/proposer/Cargo.toml @@ -14,6 +14,7 @@ polkadot-primitives = { path = "../../../primitives" } sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } sp-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" } From 780a34df145e76c463c8d9ab2564996464d790ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Wed, 17 Mar 2021 15:39:12 +0100 Subject: [PATCH 09/25] Companion for Substrate#8386 https://github.com/paritytech/substrate/pull/8386 --- node/service/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index f2cad23c4dba..565f897acc0f 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -231,7 +231,7 @@ fn new_partial( babe::BabeLink ), grandpa::SharedVoterState, - u64, // slot-duration + std::time::Duration, // slot-duration Option, ) >, @@ -752,7 +752,7 @@ pub fn new_full( path: config.database.path() .ok_or(Error::DatabasePathRequired)? .join("parachains").join("approval-voting"), - slot_duration_millis: slot_duration, + slot_duration_millis: slot_duration.as_millis() as u64, cache_size: None, // default is fine. }; From 33b25d5ed085942686bf5331592cd0990f8ed64f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Wed, 17 Mar 2021 19:17:47 +0100 Subject: [PATCH 10/25] Fix fix fix --- Cargo.lock | 291 ++++++++++++++++++++-------------------- node/service/src/lib.rs | 6 +- 2 files changed, 149 insertions(+), 148 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1f51652217fd..07e6dba47b5b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1648,7 +1648,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "parity-scale-codec", ] @@ -1666,7 +1666,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "3.1.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-support", "frame-system", @@ -1685,7 +1685,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "Inflector", "chrono", @@ -1708,7 +1708,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-support", "frame-system", @@ -1721,7 +1721,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-support", "frame-system", @@ -1737,7 +1737,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "13.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "parity-scale-codec", "serde", @@ -1748,7 +1748,7 @@ dependencies = [ [[package]] name = "frame-support" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "bitflags", "frame-metadata", @@ -1774,7 +1774,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -1786,7 +1786,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.0.0", @@ -1798,7 +1798,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "proc-macro2", "quote", @@ -1808,7 +1808,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-metadata", "frame-support", @@ -1829,7 +1829,7 @@ dependencies = [ [[package]] name = "frame-system" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1846,7 +1846,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-benchmarking", "frame-support", @@ -1860,7 +1860,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "parity-scale-codec", "sp-api", @@ -1869,7 +1869,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-support", "parity-scale-codec", @@ -4171,7 +4171,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b" [[package]] name = "pallet-authority-discovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-support", "frame-system", @@ -4187,7 +4187,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-support", "frame-system", @@ -4202,7 +4202,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4226,7 +4226,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4241,7 +4241,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4256,7 +4256,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4273,7 +4273,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4288,7 +4288,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4309,7 +4309,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4325,7 +4325,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4347,7 +4347,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4363,7 +4363,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4383,7 +4383,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4400,7 +4400,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-support", "frame-system", @@ -4414,7 +4414,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4430,7 +4430,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-support", "frame-system", @@ -4444,7 +4444,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-support", "frame-system", @@ -4460,7 +4460,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4482,7 +4482,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4498,7 +4498,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-support", "frame-system", @@ -4511,7 +4511,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "enumflags2", "frame-support", @@ -4526,7 +4526,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4542,7 +4542,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-support", "frame-system", @@ -4562,7 +4562,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4578,7 +4578,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-support", "frame-system", @@ -4592,7 +4592,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4616,7 +4616,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -4627,7 +4627,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-support", "frame-system", @@ -4641,7 +4641,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4660,7 +4660,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4675,7 +4675,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-support", "frame-system", @@ -4691,7 +4691,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4708,7 +4708,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -4719,7 +4719,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4735,7 +4735,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4751,7 +4751,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "enumflags2", "frame-benchmarking", @@ -6920,7 +6920,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "env_logger 0.8.2", "hex-literal", @@ -7176,7 +7176,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "async-trait", "derive_more", @@ -7204,7 +7204,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -7227,7 +7227,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -7243,7 +7243,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7264,7 +7264,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -7275,7 +7275,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "chrono", "fdlimit", @@ -7313,7 +7313,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "derive_more", "fnv", @@ -7347,7 +7347,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "blake2-rfc", "hash-db", @@ -7377,7 +7377,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "sc-client-api", "sp-blockchain", @@ -7388,7 +7388,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "async-trait", "derive_more", @@ -7435,7 +7435,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "derive_more", "futures 0.3.12", @@ -7459,7 +7459,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "fork-tree", "parity-scale-codec", @@ -7472,7 +7472,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -7500,7 +7500,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "sc-client-api", "sp-authorship", @@ -7511,7 +7511,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "derive_more", "lazy_static", @@ -7540,7 +7540,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "derive_more", "parity-scale-codec", @@ -7556,7 +7556,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "log", "parity-scale-codec", @@ -7571,7 +7571,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "log", "parity-scale-codec", @@ -7589,7 +7589,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "derive_more", "dyn-clone", @@ -7628,7 +7628,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "derive_more", "finality-grandpa", @@ -7652,7 +7652,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-warp-sync" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "derive_more", "futures 0.3.12", @@ -7673,7 +7673,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "ansi_term 0.12.1", "futures 0.3.12", @@ -7691,7 +7691,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "async-trait", "derive_more", @@ -7711,7 +7711,7 @@ dependencies = [ [[package]] name = "sc-light" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "hash-db", "lazy_static", @@ -7730,7 +7730,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "async-std", "async-trait", @@ -7783,7 +7783,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -7799,7 +7799,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "bytes 0.5.6", "fnv", @@ -7827,7 +7827,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "futures 0.3.12", "libp2p", @@ -7840,7 +7840,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7849,7 +7849,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "futures 0.3.12", "hash-db", @@ -7883,7 +7883,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "derive_more", "futures 0.3.12", @@ -7907,7 +7907,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "futures 0.1.29", "jsonrpc-core", @@ -7925,7 +7925,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "directories", "exit-future", @@ -7988,7 +7988,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "log", "parity-scale-codec", @@ -8003,7 +8003,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -8023,7 +8023,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "chrono", "futures 0.3.12", @@ -8043,7 +8043,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "ansi_term 0.12.1", "atty", @@ -8070,7 +8070,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -8081,7 +8081,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "derive_more", "futures 0.3.12", @@ -8103,7 +8103,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "futures 0.3.12", "futures-diagnose", @@ -8509,7 +8509,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "log", "sp-core", @@ -8521,7 +8521,7 @@ dependencies = [ [[package]] name = "sp-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "hash-db", "log", @@ -8538,7 +8538,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "blake2-rfc", "proc-macro-crate 1.0.0", @@ -8550,7 +8550,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "parity-scale-codec", "serde", @@ -8562,7 +8562,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "integer-sqrt", "num-traits", @@ -8575,7 +8575,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "parity-scale-codec", "sp-api", @@ -8587,7 +8587,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -8598,7 +8598,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "parity-scale-codec", "sp-api", @@ -8610,7 +8610,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "futures 0.3.12", "log", @@ -8628,7 +8628,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "serde", "serde_json", @@ -8637,7 +8637,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "async-trait", "futures 0.3.12", @@ -8664,7 +8664,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "merlin", "parity-scale-codec", @@ -8679,12 +8679,13 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-std", + "sp-timestamp", ] [[package]] name = "sp-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -8694,7 +8695,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -8706,7 +8707,7 @@ dependencies = [ [[package]] name = "sp-core" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "base58", "blake2-rfc", @@ -8750,7 +8751,7 @@ dependencies = [ [[package]] name = "sp-database" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -8759,7 +8760,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "proc-macro2", "quote", @@ -8769,7 +8770,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "environmental", "parity-scale-codec", @@ -8780,7 +8781,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "finality-grandpa", "log", @@ -8797,7 +8798,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -8811,7 +8812,7 @@ dependencies = [ [[package]] name = "sp-io" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "futures 0.3.12", "hash-db", @@ -8835,7 +8836,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "lazy_static", "sp-core", @@ -8846,7 +8847,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "async-trait", "derive_more", @@ -8863,7 +8864,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "parity-scale-codec", "serde", @@ -8876,7 +8877,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -8887,7 +8888,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "sp-api", "sp-core", @@ -8897,7 +8898,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "backtrace", ] @@ -8905,7 +8906,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "serde", "sp-core", @@ -8914,7 +8915,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "either", "hash256-std-hasher", @@ -8935,7 +8936,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8952,7 +8953,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", @@ -8964,7 +8965,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "serde", "serde_json", @@ -8973,7 +8974,7 @@ dependencies = [ [[package]] name = "sp-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "parity-scale-codec", "sp-api", @@ -8986,7 +8987,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -8996,7 +8997,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "hash-db", "log", @@ -9018,12 +9019,12 @@ dependencies = [ [[package]] name = "sp-std" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" [[package]] name = "sp-storage" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9036,7 +9037,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "log", "sp-core", @@ -9049,7 +9050,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "futures-timer 3.0.2", "log", @@ -9065,7 +9066,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "log", "parity-scale-codec", @@ -9078,7 +9079,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "derive_more", "futures 0.3.12", @@ -9094,7 +9095,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "hash-db", "memory-db", @@ -9108,7 +9109,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "futures 0.3.12", "futures-core", @@ -9120,7 +9121,7 @@ dependencies = [ [[package]] name = "sp-version" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9132,7 +9133,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9264,7 +9265,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "chrono", "console_error_panic_hook", @@ -9290,7 +9291,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "platforms", ] @@ -9298,7 +9299,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.12", @@ -9321,7 +9322,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "async-std", "derive_more", @@ -9335,7 +9336,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "futures 0.1.29", "futures 0.3.12", @@ -9363,7 +9364,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "futures 0.3.12", "substrate-test-utils-derive", @@ -9373,7 +9374,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "proc-macro-crate 1.0.0", "quote", @@ -10056,7 +10057,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] name = "try-runtime-cli" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#7c20c60fd7ce6858ac6ae963fb2aaf5ee2156810" +source = "git+https://github.com/paritytech/substrate.git?branch=bkchr-inherent-something-future#3c44055b5085cadee78517b5d8dd94de88659ca9" dependencies = [ "frame-try-runtime", "log", diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index 565f897acc0f..025df2d0a703 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -324,7 +324,7 @@ fn new_partial( let slot = sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_duration( - timestamp.as_duration(), + *timestamp, slot_duration, ); @@ -905,7 +905,7 @@ pub fn new_full( let slot = sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_duration( - timestamp.as_duration(), + *timestamp, slot_duration, ); @@ -1085,7 +1085,7 @@ fn new_light(mut config: Configuration) -> Result<( let slot = sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_duration( - timestamp.as_duration(), + *timestamp, slot_duration, ); From 7b3b2b86b78a9ce41fa7d60fe6e15bd2b064d073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Tue, 6 Apr 2021 12:54:40 +0200 Subject: [PATCH 11/25] Fix --- primitives/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index bca17e3fc859..68810539475d 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -9,7 +9,7 @@ serde = { version = "1.0.123", optional = true, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["bit-vec", "derive"] } primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "master, default-features = false" } +application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } From 6564355a39f8487cc2af27cdc384821e2b45324f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Tue, 6 Apr 2021 15:35:27 +0200 Subject: [PATCH 12/25] Fix compilation --- node/service/Cargo.toml | 1 + node/service/src/chain_spec.rs | 2 +- node/service/src/lib.rs | 2 +- runtime/parachains/src/paras_inherent.rs | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index 0e390926ff7c..7f87f01d4dd8 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -15,6 +15,7 @@ sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = " sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-consensus-uncles = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/node/service/src/chain_spec.rs b/node/service/src/chain_spec.rs index 37098dddbee3..ec98e2734589 100644 --- a/node/service/src/chain_spec.rs +++ b/node/service/src/chain_spec.rs @@ -17,7 +17,7 @@ //! Polkadot chain configurations. use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId; -use babe_primitives::AuthorityId as BabeId; +use sp_consensus_babe::AuthorityId as BabeId; use beefy_primitives::ecdsa::AuthorityId as BeefyId; use grandpa::AuthorityId as GrandpaId; use hex_literal::hex; diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index da57d306d8cb..ba26dec964b7 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -1004,7 +1004,7 @@ pub fn new_full( block_import, env: proposer, sync_oracle: network.clone(), - inherent_data_providers: move |parent, ()| { + create_inherent_data_providers: move |parent, ()| { let client_clone = client_clone.clone(); async move { let uncles = sc_consensus_uncles::create_uncles_inherent_data_provider( diff --git a/runtime/parachains/src/paras_inherent.rs b/runtime/parachains/src/paras_inherent.rs index c44352089b81..55bdb23f0a19 100644 --- a/runtime/parachains/src/paras_inherent.rs +++ b/runtime/parachains/src/paras_inherent.rs @@ -31,6 +31,7 @@ use frame_support::{ dispatch::DispatchResultWithPostInfo, weights::{DispatchClass, Weight}, traits::Get, + inherent::{InherentIdentifier, InherentData, MakeFatalError, ProvideInherent}, }; use frame_system::ensure_none; use crate::{ @@ -38,7 +39,6 @@ use crate::{ scheduler::{self, FreedReason}, ump, }; -use inherents::{InherentIdentifier, InherentData, MakeFatalError, ProvideInherent}; const LOG_TARGET: &str = "runtime::inclusion-inherent"; // In the future, we should benchmark these consts; these are all untested assumptions for now. From f425227c32d356d17ebffc3f10b5a021eb33d283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Tue, 6 Apr 2021 20:15:18 +0200 Subject: [PATCH 13/25] Rewrite to `ParachainsInherentDataProvider` --- node/core/proposer/Cargo.toml | 11 +- node/core/proposer/src/lib.rs | 322 ++++++++-------------------------- 2 files changed, 75 insertions(+), 258 deletions(-) diff --git a/node/core/proposer/Cargo.toml b/node/core/proposer/Cargo.toml index f2532d61d1cd..0e3e1ef6d6f9 100644 --- a/node/core/proposer/Cargo.toml +++ b/node/core/proposer/Cargo.toml @@ -8,18 +8,11 @@ edition = "2018" futures = "0.3.12" futures-timer = "3.0.2" tracing = "0.1.25" +thiserror = "1.0.23" +async-trait = "0.1.47" polkadot-node-subsystem = { path = "../../subsystem" } polkadot-overseer = { path = "../../overseer" } polkadot-primitives = { path = "../../../primitives" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/node/core/proposer/src/lib.rs b/node/core/proposer/src/lib.rs index 1a8fd5c28a31..b4dd4a83127d 100644 --- a/node/core/proposer/src/lib.rs +++ b/node/core/proposer/src/lib.rs @@ -18,289 +18,113 @@ #![deny(unused_crate_dependencies, unused_results)] -use futures::prelude::*; -use futures::select; +use futures::{select, FutureExt}; use polkadot_node_subsystem::{ - jaeger, - messages::{AllMessages, ProvisionerInherentData, ProvisionerMessage}, SubsystemError, + messages::{AllMessages, ProvisionerMessage}, SubsystemError, }; use polkadot_overseer::OverseerHandler; use polkadot_primitives::v1::{ - Block, Hash, Header, InherentData as ParachainsInherentData, + Block, Hash, InherentData as ParachainsInherentData, }; -use sc_block_builder::{BlockBuilderApi, BlockBuilderProvider}; -use sc_telemetry::TelemetryHandle; -use sp_core::traits::SpawnNamed; -use sp_api::{ApiExt, ProvideRuntimeApi}; use sp_blockchain::HeaderBackend; -use sp_consensus::{Proposal, DisableProofRecording}; -use sp_inherents::InherentData; -use sp_runtime::traits::{DigestFor, HashFor}; -use sp_transaction_pool::TransactionPool; -use prometheus_endpoint::Registry as PrometheusRegistry; -use std::{fmt, pin::Pin, sync::Arc, time}; +use sp_runtime::generic::BlockId; +use std::time; -/// How long proposal can take before we give up and err out -const PROPOSE_TIMEOUT: core::time::Duration = core::time::Duration::from_millis(2500); +/// How long to wait for the provisition, before giving up. +const PROVISIONER_TIMEOUT: time::Duration = core::time::Duration::from_millis(2500); -/// Custom Proposer factory for Polkadot -pub struct ProposerFactory { - inner: sc_basic_authorship::ProposerFactory, - overseer: OverseerHandler, +pub struct ParachainsInherentDataProvider { + inherent_data: ParachainsInherentData, } -impl ProposerFactory { - pub fn new( - spawn_handle: impl SpawnNamed + 'static, - client: Arc, - transaction_pool: Arc, - overseer: OverseerHandler, - prometheus: Option<&PrometheusRegistry>, - telemetry: Option, - ) -> Self { - ProposerFactory { - inner: sc_basic_authorship::ProposerFactory::new( - spawn_handle, - client, - transaction_pool, - prometheus, - telemetry, - ), - overseer, - } - } -} - -impl sp_consensus::Environment - for ProposerFactory -where - TxPool: 'static + TransactionPool, - Client: 'static - + BlockBuilderProvider - + ProvideRuntimeApi - + HeaderBackend - + Send - + Sync, - Client::Api: - BlockBuilderApi + ApiExt, - Backend: - 'static + sc_client_api::Backend>, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - sp_api::StateBackendFor: sp_api::StateBackend> + Send, -{ - type CreateProposer = Pin> + Send + 'static, - >>; - type Proposer = Proposer; - type Error = Error; - - fn init(&mut self, parent_header: &Header) -> Self::CreateProposer { - // create the inner proposer - let proposer = self.inner.init(parent_header).into_inner(); - - // data to be moved into the future - let overseer = self.overseer.clone(); - let parent_header_hash = parent_header.hash(); - let parent_header = parent_header.clone(); - - async move { - Ok(Proposer { - inner: proposer?, - overseer, - parent_header, - parent_header_hash, - }) - }.boxed() - } -} - -/// Custom Proposer for Polkadot. -/// -/// This proposer gets the ProvisionerInherentData and injects it into the wrapped -/// proposer's inherent data, then delegates the actual proposal generation. -pub struct Proposer, Backend, Client> { - inner: sc_basic_authorship::Proposer, - overseer: OverseerHandler, - parent_header: Header, - parent_header_hash: Hash, -} - -// This impl has the same generic bounds as the Proposer impl. -impl Proposer -where - TxPool: 'static + TransactionPool, - Client: 'static - + BlockBuilderProvider - + ProvideRuntimeApi - + HeaderBackend - + Send - + Sync, - Client::Api: - BlockBuilderApi + ApiExt, - Backend: - 'static + sc_client_api::Backend>, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - sp_api::StateBackendFor: sp_api::StateBackend> + Send, -{ - /// Get provisioner inherent data - /// - /// This function has a constant timeout: `PROPOSE_TIMEOUT`. - async fn get_provisioner_data(&self) -> Result { - // clone this (lightweight) data because we're going to move it into the future - let mut overseer = self.overseer.clone(); - let parent_header_hash = self.parent_header_hash.clone(); - +impl ParachainsInherentDataProvider { + pub async fn create>( + client: &C, + mut overseer: OverseerHandler, + parent: Hash, + ) -> Result { let pid = async { let (sender, receiver) = futures::channel::oneshot::channel(); - overseer.wait_for_activation(parent_header_hash, sender).await; - receiver.await.map_err(|_| Error::ClosedChannelAwaitingActivation)??; + overseer.wait_for_activation(parent, sender).await; + receiver.await.map_err(|_| Error::ClosedChannelAwaitingActivation)?.map_err(Error::Subsystem)?; let (sender, receiver) = futures::channel::oneshot::channel(); overseer.send_msg(AllMessages::Provisioner( - ProvisionerMessage::RequestInherentData(parent_header_hash, sender), + ProvisionerMessage::RequestInherentData(parent, sender), )).await; receiver.await.map_err(|_| Error::ClosedChannelAwaitingInherentData) }; - let mut timeout = futures_timer::Delay::new(PROPOSE_TIMEOUT).fuse(); + let mut timeout = futures_timer::Delay::new(PROVISIONER_TIMEOUT).fuse(); + + let parent_header = match client.header(BlockId::Hash(parent)) { + Ok(Some(h)) => h, + Ok(None) => return Err(Error::ParentHeaderNotFound(parent)), + Err(err) => return Err(Error::Blockchain(err)), + }; - select! { + let res = select! { pid = pid.fuse() => pid, _ = timeout => Err(Error::Timeout), - } - } -} - -impl sp_consensus::Proposer for Proposer -where - TxPool: 'static + TransactionPool, - Client: 'static - + BlockBuilderProvider - + ProvideRuntimeApi - + HeaderBackend - + Send - + Sync, - Client::Api: - BlockBuilderApi + ApiExt, - Backend: - 'static + sc_client_api::Backend>, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - sp_api::StateBackendFor: sp_api::StateBackend> + Send, -{ - type Transaction = sc_client_api::TransactionFor; - type Proposal = Pin, ()>, Error>> + Send, - >>; - type Error = Error; - type ProofRecording = DisableProofRecording; - type Proof = (); - - fn propose( - self, - mut inherent_data: InherentData, - inherent_digests: DigestFor, - max_duration: time::Duration, - ) -> Self::Proposal { - async move { - let span = jaeger::Span::new(self.parent_header_hash, "propose"); - let _span = span.child("get-provisioner"); + }; - let parachains_inherent_data = match self.get_provisioner_data().await { - Ok(pd) => ParachainsInherentData { - bitfields: pd.bitfields, - backed_candidates: pd.backed_candidates, - disputes: pd.disputes, - parent_header: self.parent_header, - }, - Err(err) => { - tracing::warn!(err = ?err, "could not get provisioner inherent data; injecting default data"); - ParachainsInherentData { - bitfields: Vec::new(), - backed_candidates: Vec::new(), - disputes: Vec::new(), - parent_header: self.parent_header, - } + let inherent_data = match res { + Ok(pd) => ParachainsInherentData { + bitfields: pd.bitfields, + backed_candidates: pd.backed_candidates, + disputes: pd.disputes, + parent_header, + }, + Err(err) => { + tracing::debug!( + ?err, + "Could not get provisioner inherent data; injecting default data", + ); + ParachainsInherentData { + bitfields: Vec::new(), + backed_candidates: Vec::new(), + disputes: Vec::new(), + parent_header, } - }; + } + }; - drop(_span); + Ok(Self { inherent_data }) + } +} - inherent_data.put_data( - polkadot_primitives::v1::PARACHAINS_INHERENT_IDENTIFIER, - ¶chains_inherent_data, - )?; +#[async_trait::async_trait] +impl sp_inherents::InherentDataProvider for ParachainsInherentDataProvider { + fn provide_inherent_data(&self, inherent_data: &mut sp_inherents::InherentData) -> Result<(), sp_inherents::Error> { + inherent_data.put_data( + polkadot_primitives::v1::PARACHAINS_INHERENT_IDENTIFIER, + &self.inherent_data, + ) + } - let _span = span.child("authorship-propose"); - self.inner - .propose(inherent_data, inherent_digests, max_duration) - .await - .map_err(Into::into) - } - .boxed() + async fn try_handle_error( + &self, + _: &sp_inherents::InherentIdentifier, + _: &[u8], + ) -> Option> { + // Inherent isn't checked and can not return any error + None } } -// It would have been more ergonomic to use thiserror to derive the -// From implementations, Display, and std::error::Error, but unfortunately -// one of the wrapped errors (sp_inherents::Error) also -// don't impl std::error::Error, which breaks the thiserror derive. -#[derive(Debug)] +#[derive(thiserror::Error, Debug)] pub enum Error { - Consensus(sp_consensus::Error), + #[error("Blockchain error")] Blockchain(sp_blockchain::Error), - Inherent(sp_inherents::Error), + #[error("Timeout: provisioner did not return inherent data after {:?}", PROVISIONER_TIMEOUT)] Timeout, + #[error("Could not find the parent header in the blockchain: {:?}", _0)] + ParentHeaderNotFound(Hash), + #[error("Closed channel from overseer when awaiting activation")] ClosedChannelAwaitingActivation, + #[error("Closed channel from provisioner when awaiting inherent data")] ClosedChannelAwaitingInherentData, - Subsystem(SubsystemError) -} - -impl From for Error { - fn from(e: sp_consensus::Error) -> Error { - Error::Consensus(e) - } -} - -impl From for Error { - fn from(e: sp_blockchain::Error) -> Error { - Error::Blockchain(e) - } -} - -impl From for Error { - fn from(e: sp_inherents::Error) -> Error { - Error::Inherent(e) - } -} - -impl From for Error { - fn from(e: SubsystemError) -> Error { - Error::Subsystem(e) - } -} - -impl fmt::Display for Error { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - match self { - Self::Consensus(err) => write!(f, "consensus error: {}", err), - Self::Blockchain(err) => write!(f, "blockchain error: {}", err), - Self::Inherent(err) => write!(f, "inherent error: {:?}", err), - Self::Timeout => write!(f, "timeout: provisioner did not return inherent data after {:?}", PROPOSE_TIMEOUT), - Self::ClosedChannelAwaitingActivation => write!(f, "closed channel from overseer when awaiting activation"), - Self::ClosedChannelAwaitingInherentData => write!(f, "closed channel from provisioner when awaiting inherent data"), - Self::Subsystem(err) => write!(f, "subsystem error: {:?}", err), - } - } -} - -impl std::error::Error for Error { - fn source(&self) -> Option<&(dyn std::error::Error + 'static)> { - match self { - Self::Consensus(err) => Some(err), - Self::Blockchain(err) => Some(err), - Self::Subsystem(err) => Some(err), - _ => None - } - } + #[error("Subsystem failed")] + Subsystem(SubsystemError), } From 601a88358ef5deb6137e1dfcfe9898b8ab0cdc66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Wed, 7 Apr 2021 19:44:30 +0200 Subject: [PATCH 14/25] Make it compile --- node/service/Cargo.toml | 1 + node/service/src/lib.rs | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index 7f87f01d4dd8..302fdfbf44b4 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -23,6 +23,7 @@ sc-finality-grandpa-warp-sync = { git = "https://github.com/paritytech/substrate sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" } service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index ba26dec964b7..32dbae09c576 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -30,7 +30,6 @@ use { polkadot_node_core_av_store::Config as AvailabilityConfig, polkadot_node_core_av_store::Error as AvailabilityError, polkadot_node_core_approval_voting::Config as ApprovalVotingConfig, - polkadot_node_core_proposer::ProposerFactory, polkadot_overseer::{AllSubsystems, BlockInfo, Overseer, OverseerHandler}, polkadot_primitives::v1::ParachainHost, sc_authority_discovery::Service as AuthorityDiscoveryService, @@ -980,22 +979,24 @@ pub fn new_full( })); Some(overseer_handler) - } else { None }; + } else { + None + }; if role.is_authority() { let can_author_with = consensus_common::CanAuthorWithNativeVersion::new(client.executor().clone()); - let proposer = ProposerFactory::new( + let proposer = sc_basic_authorship::ProposerFactory::new( task_manager.spawn_handle(), client.clone(), transaction_pool, - overseer_handler.as_ref().ok_or(Error::AuthoritiesRequireRealOverseer)?.clone(), prometheus_registry.as_ref(), telemetry.as_ref().map(|x| x.handle()), ); let client_clone = client.clone(); + let overseer_handler = overseer_handler.as_ref().ok_or(Error::AuthoritiesRequireRealOverseer)?.clone(); let slot_duration = babe_link.config().slot_duration(); let babe_config = babe::BabeParams { keystore: keystore_container.sync_keystore(), @@ -1006,7 +1007,14 @@ pub fn new_full( sync_oracle: network.clone(), create_inherent_data_providers: move |parent, ()| { let client_clone = client_clone.clone(); + let overseer_handler = overseer_handler.clone(); async move { + let parachain = polkadot_node_core_proposer::ParachainsInherentDataProvider::create( + &*client_clone, + overseer_handler, + parent, + ).await.map_err(|e| Box::new(e))?; + let uncles = sc_consensus_uncles::create_uncles_inherent_data_provider( &*client_clone, parent, @@ -1020,7 +1028,7 @@ pub fn new_full( slot_duration, ); - Ok((timestamp, slot, uncles)) + Ok((timestamp, slot, uncles, parachain)) } }, force_authoring, From 238e210541d31aec474a020d91f5c74f289d98f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Wed, 7 Apr 2021 20:49:56 +0200 Subject: [PATCH 15/25] Renamings --- Cargo.lock | 383 +++++++++--------- Cargo.toml | 2 +- .../Cargo.toml | 2 +- .../src/lib.rs | 12 +- node/service/Cargo.toml | 2 +- node/service/src/lib.rs | 2 +- 6 files changed, 202 insertions(+), 201 deletions(-) rename node/core/{proposer => parachains-inherent}/Cargo.toml (92%) rename node/core/{proposer => parachains-inherent}/src/lib.rs (84%) diff --git a/Cargo.lock b/Cargo.lock index 881a851aa014..f7850d3b6cf7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -334,9 +334,9 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" [[package]] name = "async-trait" -version = "0.1.42" +version = "0.1.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d" +checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf" dependencies = [ "proc-macro2", "quote", @@ -448,7 +448,7 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "beefy-gadget" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget#8213c08e3dcf7fc732b3be6c73f8c6d3619abae2" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#f1ad65b013423e62c11214f2b1f9af2b6e27650a" dependencies = [ "beefy-primitives", "futures 0.3.13", @@ -475,7 +475,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget#8213c08e3dcf7fc732b3be6c73f8c6d3619abae2" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#f1ad65b013423e62c11214f2b1f9af2b6e27650a" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -496,7 +496,7 @@ dependencies = [ [[package]] name = "beefy-primitives" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget#8213c08e3dcf7fc732b3be6c73f8c6d3619abae2" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#f1ad65b013423e62c11214f2b1f9af2b6e27650a" dependencies = [ "parity-scale-codec", "sp-api", @@ -1758,7 +1758,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "parity-scale-codec", ] @@ -1776,7 +1776,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "3.1.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-support", "frame-system", @@ -1795,7 +1795,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "Inflector", "chrono", @@ -1818,7 +1818,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-support", "frame-system", @@ -1831,7 +1831,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-support", "frame-system", @@ -1847,7 +1847,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "13.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "parity-scale-codec", "serde", @@ -1858,7 +1858,7 @@ dependencies = [ [[package]] name = "frame-support" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "bitflags", "frame-metadata", @@ -1884,7 +1884,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -1896,7 +1896,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.0.0", @@ -1908,7 +1908,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "proc-macro2", "quote", @@ -1918,7 +1918,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-metadata", "frame-support", @@ -1939,7 +1939,7 @@ dependencies = [ [[package]] name = "frame-system" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1956,7 +1956,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-benchmarking", "frame-support", @@ -1970,7 +1970,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "parity-scale-codec", "sp-api", @@ -1979,7 +1979,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-support", "parity-scale-codec", @@ -2874,9 +2874,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.46" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175" +checksum = "5cfb73131c35423a367daf8cbd24100af0d077668c8c2943f0e7dd775fef0f65" dependencies = [ "wasm-bindgen", ] @@ -3005,13 +3005,14 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.2.0-alpha.2" +version = "0.2.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f1d8440e2617bdebdf45114e90f65aed3f14bf73e23d874dde8e4b764676fe9" +checksum = "9b15fc3a0ef2e02d770aa1a221d3412443dcaedc43e27d80c957dd5bbd65321b" dependencies = [ "async-trait", "futures 0.3.13", "hyper 0.13.9", + "hyper-rustls", "jsonrpsee-types", "jsonrpsee-utils", "log", @@ -3024,9 +3025,9 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.2.0-alpha.2" +version = "0.2.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb3f732ccbeafd15cefb59c7c7b5ac6c553c2653613b63e5e7feb7f06a219e9" +checksum = "6bb4afbda476e2ee11cc6245055c498c116fc8002d2d60fe8338b6ee15d84c3a" dependencies = [ "Inflector", "proc-macro2", @@ -3036,9 +3037,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.2.0-alpha.2" +version = "0.2.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a8cd20c190e75dc56f7543b9d5713c3186351b301b5507ea6b85d8c403aac78" +checksum = "c42a82588b5f7830e94341bb7e79d15f46070ab6f64dde1e3b3719721b61c5bf" dependencies = [ "async-trait", "futures 0.3.13", @@ -3051,9 +3052,9 @@ dependencies = [ [[package]] name = "jsonrpsee-utils" -version = "0.2.0-alpha.2" +version = "0.2.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51670a3b56e5fb0d325920ce317c76184b8afabfd7bc5009831229cfef0732b" +checksum = "e65c77838fce96bc554b4a3a159d0b9a2497319ae9305c66ee853998c7ed2fd3" dependencies = [ "futures 0.3.13", "globset", @@ -4360,7 +4361,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b" [[package]] name = "pallet-authority-discovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-support", "frame-system", @@ -4376,7 +4377,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-support", "frame-system", @@ -4391,7 +4392,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-benchmarking", "frame-support", @@ -4415,7 +4416,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-benchmarking", "frame-support", @@ -4430,7 +4431,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget#8213c08e3dcf7fc732b3be6c73f8c6d3619abae2" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#f1ad65b013423e62c11214f2b1f9af2b6e27650a" dependencies = [ "beefy-primitives", "frame-support", @@ -4445,7 +4446,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-benchmarking", "frame-support", @@ -4460,7 +4461,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-benchmarking", "frame-support", @@ -4477,7 +4478,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-benchmarking", "frame-support", @@ -4492,7 +4493,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4513,7 +4514,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-benchmarking", "frame-support", @@ -4529,7 +4530,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-benchmarking", "frame-support", @@ -4551,7 +4552,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4567,7 +4568,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-benchmarking", "frame-support", @@ -4587,7 +4588,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-benchmarking", "frame-support", @@ -4604,7 +4605,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-support", "frame-system", @@ -4618,7 +4619,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -4636,7 +4637,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-support", "frame-system", @@ -4652,7 +4653,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4670,7 +4671,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-benchmarking", "frame-support", @@ -4686,7 +4687,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-support", "frame-system", @@ -4700,7 +4701,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-support", "frame-system", @@ -4716,7 +4717,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4738,7 +4739,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-benchmarking", "frame-support", @@ -4754,7 +4755,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-support", "frame-system", @@ -4767,7 +4768,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "enumflags2", "frame-support", @@ -4782,7 +4783,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-benchmarking", "frame-support", @@ -4798,7 +4799,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-support", "frame-system", @@ -4818,7 +4819,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-benchmarking", "frame-support", @@ -4834,7 +4835,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-support", "frame-system", @@ -4848,7 +4849,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4872,7 +4873,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -4883,7 +4884,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-support", "frame-system", @@ -4897,7 +4898,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-benchmarking", "frame-support", @@ -4916,7 +4917,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-benchmarking", "frame-support", @@ -4931,7 +4932,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-support", "frame-system", @@ -4947,7 +4948,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4964,7 +4965,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -4975,7 +4976,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-benchmarking", "frame-support", @@ -4991,7 +4992,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5007,7 +5008,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5834,26 +5835,19 @@ dependencies = [ ] [[package]] -name = "polkadot-node-core-proposer" +name = "polkadot-node-core-parachains-inherent" version = "0.1.0" dependencies = [ + "async-trait", "futures 0.3.13", "futures-timer 3.0.2", "polkadot-node-subsystem", "polkadot-overseer", "polkadot-primitives", - "sc-basic-authorship", - "sc-block-builder", - "sc-client-api", - "sc-telemetry", - "sp-api", "sp-blockchain", - "sp-consensus", - "sp-core", "sp-inherents", "sp-runtime", - "sp-transaction-pool", - "substrate-prometheus-endpoint", + "thiserror", "tracing", ] @@ -6366,7 +6360,7 @@ dependencies = [ "polkadot-node-core-candidate-selection", "polkadot-node-core-candidate-validation", "polkadot-node-core-chain-api", - "polkadot-node-core-proposer", + "polkadot-node-core-parachains-inherent", "polkadot-node-core-provisioner", "polkadot-node-core-runtime-api", "polkadot-node-primitives", @@ -6382,6 +6376,7 @@ dependencies = [ "polkadot-test-client", "rococo-runtime", "sc-authority-discovery", + "sc-basic-authorship", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -7189,7 +7184,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "env_logger 0.8.2", "hex-literal", @@ -7462,7 +7457,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "async-trait", "derive_more", @@ -7490,7 +7485,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "futures 0.3.13", "futures-timer 3.0.2", @@ -7513,7 +7508,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -7529,7 +7524,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7550,7 +7545,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -7561,7 +7556,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "chrono", "fdlimit", @@ -7599,7 +7594,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "derive_more", "fnv", @@ -7633,7 +7628,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "blake2-rfc", "hash-db", @@ -7663,7 +7658,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "parking_lot 0.11.1", "sc-client-api", @@ -7675,7 +7670,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "async-trait", "derive_more", @@ -7722,7 +7717,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "derive_more", "futures 0.3.13", @@ -7746,7 +7741,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "fork-tree", "parity-scale-codec", @@ -7759,12 +7754,11 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "async-trait", "futures 0.3.13", "futures-timer 3.0.2", - "impl-trait-for-tuples", "log", "parity-scale-codec", "sc-client-api", @@ -7787,18 +7781,21 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ + "log", "sc-client-api", "sp-authorship", + "sp-consensus", + "sp-core", + "sp-inherents", "sp-runtime", - "thiserror", ] [[package]] name = "sc-executor" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "derive_more", "lazy_static", @@ -7827,11 +7824,12 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "derive_more", "parity-scale-codec", "parity-wasm 0.41.0", + "pwasm-utils", "sp-allocator", "sp-core", "sp-serializer", @@ -7843,7 +7841,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "log", "parity-scale-codec", @@ -7858,7 +7856,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "log", "parity-scale-codec", @@ -7876,7 +7874,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "async-trait", "derive_more", @@ -7916,7 +7914,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "derive_more", "finality-grandpa", @@ -7940,7 +7938,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-warp-sync" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "derive_more", "futures 0.3.13", @@ -7961,7 +7959,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "ansi_term 0.12.1", "futures 0.3.13", @@ -7979,7 +7977,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "async-trait", "derive_more", @@ -7999,7 +7997,7 @@ dependencies = [ [[package]] name = "sc-light" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "hash-db", "lazy_static", @@ -8018,7 +8016,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "async-std", "async-trait", @@ -8071,7 +8069,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "futures 0.3.13", "futures-timer 3.0.2", @@ -8088,7 +8086,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "bytes 0.5.6", "fnv", @@ -8116,7 +8114,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "futures 0.3.13", "libp2p", @@ -8129,7 +8127,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8138,7 +8136,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "futures 0.3.13", "hash-db", @@ -8172,7 +8170,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "derive_more", "futures 0.3.13", @@ -8196,7 +8194,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "futures 0.1.29", "jsonrpc-core", @@ -8214,7 +8212,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "async-trait", "directories", @@ -8278,7 +8276,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "log", "parity-scale-codec", @@ -8293,7 +8291,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -8313,7 +8311,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "chrono", "futures 0.3.13", @@ -8333,7 +8331,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "ansi_term 0.12.1", "atty", @@ -8360,7 +8358,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -8371,7 +8369,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "derive_more", "futures 0.3.13", @@ -8393,7 +8391,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "futures 0.3.13", "futures-diagnose", @@ -8819,7 +8817,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "log", "sp-core", @@ -8831,7 +8829,7 @@ dependencies = [ [[package]] name = "sp-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "hash-db", "log", @@ -8848,7 +8846,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "blake2-rfc", "proc-macro-crate 1.0.0", @@ -8860,7 +8858,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "parity-scale-codec", "serde", @@ -8872,7 +8870,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "integer-sqrt", "num-traits", @@ -8885,7 +8883,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "parity-scale-codec", "sp-api", @@ -8897,7 +8895,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -8908,7 +8906,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "parity-scale-codec", "sp-api", @@ -8920,7 +8918,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "futures 0.3.13", "log", @@ -8938,7 +8936,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "serde", "serde_json", @@ -8947,7 +8945,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "async-trait", "futures 0.3.13", @@ -8974,7 +8972,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "merlin", "parity-scale-codec", @@ -8995,7 +8993,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -9005,7 +9003,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -9017,7 +9015,7 @@ dependencies = [ [[package]] name = "sp-core" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "base58", "blake2-rfc", @@ -9061,7 +9059,7 @@ dependencies = [ [[package]] name = "sp-database" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -9070,7 +9068,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "proc-macro2", "quote", @@ -9080,7 +9078,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "environmental", "parity-scale-codec", @@ -9091,7 +9089,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "finality-grandpa", "log", @@ -9108,13 +9106,11 @@ dependencies = [ [[package]] name = "sp-inherents" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ - "async-trait", - "impl-trait-for-tuples", "parity-scale-codec", + "parking_lot 0.11.1", "sp-core", - "sp-runtime", "sp-std", "thiserror", ] @@ -9122,7 +9118,7 @@ dependencies = [ [[package]] name = "sp-io" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "futures 0.3.13", "hash-db", @@ -9146,7 +9142,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "lazy_static", "sp-core", @@ -9157,7 +9153,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "async-trait", "derive_more", @@ -9174,7 +9170,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "parity-scale-codec", "serde", @@ -9187,7 +9183,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -9198,7 +9194,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "sp-api", "sp-core", @@ -9208,7 +9204,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "backtrace", ] @@ -9216,7 +9212,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "serde", "sp-core", @@ -9225,7 +9221,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "either", "hash256-std-hasher", @@ -9246,7 +9242,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9263,7 +9259,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", @@ -9275,7 +9271,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "serde", "serde_json", @@ -9284,7 +9280,7 @@ dependencies = [ [[package]] name = "sp-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "parity-scale-codec", "sp-api", @@ -9297,7 +9293,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -9307,7 +9303,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "hash-db", "log", @@ -9329,12 +9325,12 @@ dependencies = [ [[package]] name = "sp-std" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" [[package]] name = "sp-storage" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9347,7 +9343,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "log", "sp-core", @@ -9360,23 +9356,20 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ - "futures-timer 3.0.2", - "log", "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", "sp-std", - "thiserror", "wasm-timer", ] [[package]] name = "sp-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "log", "parity-scale-codec", @@ -9389,7 +9382,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "derive_more", "futures 0.3.13", @@ -9405,7 +9398,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "hash-db", "memory-db", @@ -9419,7 +9412,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "futures 0.3.13", "futures-core", @@ -9431,7 +9424,7 @@ dependencies = [ [[package]] name = "sp-version" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9443,7 +9436,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9600,7 +9593,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "chrono", "console_error_panic_hook", @@ -9626,7 +9619,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "platforms", ] @@ -9634,7 +9627,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.13", @@ -9657,7 +9650,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "async-std", "derive_more", @@ -9671,7 +9664,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "async-trait", "futures 0.1.29", @@ -9700,7 +9693,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "futures 0.3.13", "substrate-test-utils-derive", @@ -9710,7 +9703,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "proc-macro-crate 1.0.0", "quote", @@ -9747,9 +9740,9 @@ checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1" [[package]] name = "syn" -version = "1.0.60" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" +checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702" dependencies = [ "proc-macro2", "quote", @@ -10451,7 +10444,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] name = "try-runtime-cli" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#14b3030f92546ad2cece4f1d060cbcf6edfd21e5" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7eb671fa2532e618589c057e5ed50b06d5f9a44d" dependencies = [ "frame-try-runtime", "log", @@ -10731,9 +10724,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.70" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55c0f7123de74f0dab9b7d00fd614e7b19349cd1e2f5252bbe9b1754b59433be" +checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9" dependencies = [ "cfg-if 1.0.0", "serde", @@ -10743,9 +10736,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.70" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bc45447f0d4573f3d65720f636bbcc3dd6ce920ed704670118650bcd47764c7" +checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae" dependencies = [ "bumpalo", "lazy_static", @@ -10770,9 +10763,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.70" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b8853882eef39593ad4174dd26fc9865a64e84026d223f63bb2c42affcbba2c" +checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -10780,9 +10773,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.70" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4133b5e7f2a531fa413b3a1695e925038a05a71cf67e87dafa295cb645a01385" +checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" dependencies = [ "proc-macro2", "quote", @@ -10793,9 +10786,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.70" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4945e4943ae02d15c13962b38a5b1e81eadd4b71214eee75af64a4d6a4fd64" +checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" [[package]] name = "wasm-gc-api" diff --git a/Cargo.toml b/Cargo.toml index 0f02019ca2d9..5bcf86f4a27e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,7 +53,7 @@ members = [ "node/core/candidate-selection", "node/core/candidate-validation", "node/core/chain-api", - "node/core/proposer", + "node/core/parachains-inherent", "node/core/provisioner", "node/core/runtime-api", "node/network/approval-distribution", diff --git a/node/core/proposer/Cargo.toml b/node/core/parachains-inherent/Cargo.toml similarity index 92% rename from node/core/proposer/Cargo.toml rename to node/core/parachains-inherent/Cargo.toml index 0e3e1ef6d6f9..adbf6445489f 100644 --- a/node/core/proposer/Cargo.toml +++ b/node/core/parachains-inherent/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "polkadot-node-core-proposer" +name = "polkadot-node-core-parachains-inherent" version = "0.1.0" authors = ["Parity Technologies "] edition = "2018" diff --git a/node/core/proposer/src/lib.rs b/node/core/parachains-inherent/src/lib.rs similarity index 84% rename from node/core/proposer/src/lib.rs rename to node/core/parachains-inherent/src/lib.rs index b4dd4a83127d..5205126a0a85 100644 --- a/node/core/proposer/src/lib.rs +++ b/node/core/parachains-inherent/src/lib.rs @@ -14,7 +14,13 @@ // You should have received a copy of the GNU General Public License // along with Polkadot. If not, see . -//! The proposer proposes new blocks to include +//! The parachain inherent data provider +//! +//! Parachain backing and approval is an off-chain process, but the parachain needs to progress on chain as well. To +//! make it progress on chain a block producer needs to forward information about the state of a parachain to the +//! runtime. These information are forwarded through an inherent to the runtime. Here we provide the +//! [`ParachainInherentDataProvider`] that requests the relevant data from the provisioner subsystem and creates the +//! the inherent data that the runtime will use to create an inherent. #![deny(unused_crate_dependencies, unused_results)] @@ -30,14 +36,16 @@ use sp_blockchain::HeaderBackend; use sp_runtime::generic::BlockId; use std::time; -/// How long to wait for the provisition, before giving up. +/// How long to wait for the provisioner, before giving up. const PROVISIONER_TIMEOUT: time::Duration = core::time::Duration::from_millis(2500); +/// Provides the parachains inherent data. pub struct ParachainsInherentDataProvider { inherent_data: ParachainsInherentData, } impl ParachainsInherentDataProvider { + /// Create a new instance of the [`ParachainsInherentDataProvider`]. pub async fn create>( client: &C, mut overseer: OverseerHandler, diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index 302fdfbf44b4..eebb80fd9314 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -70,7 +70,7 @@ kvdb = "0.9.0" kvdb-rocksdb = { version = "0.11.0", optional = true } # Polkadot -polkadot-node-core-proposer = { path = "../core/proposer" } +polkadot-node-core-parachains-inherent = { path = "../core/parachains-inherent" } polkadot-overseer = { path = "../overseer" } polkadot-parachain = { path = "../../parachain" } polkadot-primitives = { path = "../../primitives" } diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index 32dbae09c576..6529b5561618 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -1009,7 +1009,7 @@ pub fn new_full( let client_clone = client_clone.clone(); let overseer_handler = overseer_handler.clone(); async move { - let parachain = polkadot_node_core_proposer::ParachainsInherentDataProvider::create( + let parachain = polkadot_node_core_parachains_inherent::ParachainsInherentDataProvider::create( &*client_clone, overseer_handler, parent, From 86e7047174a4517dd4112b050fdbfc0ffdf020ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Wed, 7 Apr 2021 21:02:34 +0200 Subject: [PATCH 16/25] Revert stuff --- bridges/bin/millau/node/Cargo.toml | 44 +++++++-------- bridges/bin/millau/runtime/Cargo.toml | 50 ++++++++--------- bridges/bin/rialto/node/Cargo.toml | 46 ++++++++-------- bridges/bin/rialto/runtime/Cargo.toml | 54 +++++++++---------- bridges/bin/runtime-common/Cargo.toml | 12 ++--- bridges/modules/call-dispatch/Cargo.toml | 12 ++--- bridges/modules/currency-exchange/Cargo.toml | 14 ++--- .../ethereum-contract/builtin/Cargo.toml | 10 ++-- bridges/modules/ethereum/Cargo.toml | 12 ++--- bridges/modules/finality-verifier/Cargo.toml | 10 ++-- bridges/modules/message-lane/Cargo.toml | 16 +++--- bridges/modules/message-lane/rpc/Cargo.toml | 12 ++--- .../modules/shift-session-manager/Cargo.toml | 14 ++--- bridges/modules/substrate/Cargo.toml | 18 +++---- .../primitives/currency-exchange/Cargo.toml | 6 +-- bridges/primitives/ethereum-poa/Cargo.toml | 8 +-- bridges/primitives/header-chain/Cargo.toml | 10 ++-- bridges/primitives/kusama/Cargo.toml | 12 ++--- bridges/primitives/message-lane/Cargo.toml | 6 +-- bridges/primitives/millau/Cargo.toml | 16 +++--- bridges/primitives/polkadot/Cargo.toml | 12 ++--- bridges/primitives/rialto/Cargo.toml | 12 ++--- bridges/primitives/runtime/Cargo.toml | 10 ++-- bridges/primitives/test-utils/Cargo.toml | 6 +-- bridges/relays/ethereum/Cargo.toml | 12 ++--- bridges/relays/kusama-client/Cargo.toml | 12 ++--- bridges/relays/millau-client/Cargo.toml | 12 ++--- bridges/relays/polkadot-client/Cargo.toml | 12 ++--- bridges/relays/rialto-client/Cargo.toml | 12 ++--- bridges/relays/substrate-client/Cargo.toml | 18 +++---- bridges/relays/substrate/Cargo.toml | 10 ++-- bridges/relays/utils/Cargo.toml | 2 +- 32 files changed, 256 insertions(+), 256 deletions(-) diff --git a/bridges/bin/millau/node/Cargo.toml b/bridges/bin/millau/node/Cargo.toml index 64882a6a5bf1..b13f35bf4c9e 100644 --- a/bridges/bin/millau/node/Cargo.toml +++ b/bridges/bin/millau/node/Cargo.toml @@ -24,31 +24,31 @@ pallet-message-lane-rpc = { path = "../../../modules/message-lane/rpc" } # Substrate Dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-cli = { git = "https://github.com/paritytech/substrate.git", features = ["wasmtime"] , branch = "master" } -sc-client-api = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-consensus = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-executor = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-keystore = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-service = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-consensus = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-inherents = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-cli = { git = "https://github.com/paritytech/substrate", features = ["wasmtime"] , branch = "master" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "master" } [build-dependencies] build-script-utils = { package = "substrate-build-script-utils", version = "2.0" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } vergen = "3.1.0" [features] diff --git a/bridges/bin/millau/runtime/Cargo.toml b/bridges/bin/millau/runtime/Cargo.toml index c9da0251500c..435ccb0bcfff 100644 --- a/bridges/bin/millau/runtime/Cargo.toml +++ b/bridges/bin/millau/runtime/Cargo.toml @@ -28,31 +28,31 @@ pallet-substrate-bridge = { path = "../../../modules/substrate", default-feature # Substrate Dependencies -frame-executive = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -pallet-aura = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -pallet-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-trie = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "2.0.0" } diff --git a/bridges/bin/rialto/node/Cargo.toml b/bridges/bin/rialto/node/Cargo.toml index 616ee78c0030..3763a5be2729 100644 --- a/bridges/bin/rialto/node/Cargo.toml +++ b/bridges/bin/rialto/node/Cargo.toml @@ -24,32 +24,32 @@ rialto-runtime = { path = "../runtime" } # Substrate Dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-cli = { git = "https://github.com/paritytech/substrate.git", features = ["wasmtime"] , branch = "master" } -sc-client-api = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-consensus = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-executor = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-keystore = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-service = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-telemetry = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-consensus = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-inherents = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-cli = { git = "https://github.com/paritytech/substrate", features = ["wasmtime"] , branch = "master" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "master" } [build-dependencies] build-script-utils = { package = "substrate-build-script-utils", version = "2.0" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } vergen = "3.1.0" [features] diff --git a/bridges/bin/rialto/runtime/Cargo.toml b/bridges/bin/rialto/runtime/Cargo.toml index 974ceeaa1727..d266a7ac9e75 100644 --- a/bridges/bin/rialto/runtime/Cargo.toml +++ b/bridges/bin/rialto/runtime/Cargo.toml @@ -34,33 +34,33 @@ pallet-shift-session-manager = { path = "../../../modules/shift-session-manager" # Substrate Dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false, optional = true } -frame-executive = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -pallet-aura = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -pallet-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-trie = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [dev-dependencies] libsecp256k1 = { version = "0.3.4", features = ["hmac"] } diff --git a/bridges/bin/runtime-common/Cargo.toml b/bridges/bin/runtime-common/Cargo.toml index 59ef9ba42fe1..d81c76ed3a9b 100644 --- a/bridges/bin/runtime-common/Cargo.toml +++ b/bridges/bin/runtime-common/Cargo.toml @@ -23,12 +23,12 @@ pallet-substrate-bridge = { path = "../../modules/substrate", default-features = # Substrate dependencies -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-state-machine = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false, optional = true } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-trie = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [features] default = ["std"] diff --git a/bridges/modules/call-dispatch/Cargo.toml b/bridges/modules/call-dispatch/Cargo.toml index 1989a48de8de..2746ee36e8f4 100644 --- a/bridges/modules/call-dispatch/Cargo.toml +++ b/bridges/modules/call-dispatch/Cargo.toml @@ -16,14 +16,14 @@ bp-runtime = { path = "../../primitives/runtime", default-features = false } # Substrate Dependencies -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } serde = "1.0" [features] diff --git a/bridges/modules/currency-exchange/Cargo.toml b/bridges/modules/currency-exchange/Cargo.toml index 45ae4adc8088..ebdde56b0dbb 100644 --- a/bridges/modules/currency-exchange/Cargo.toml +++ b/bridges/modules/currency-exchange/Cargo.toml @@ -17,15 +17,15 @@ bp-header-chain = { path = "../../primitives/header-chain", default-features = f # Substrate Dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } [features] default = ["std"] diff --git a/bridges/modules/ethereum-contract/builtin/Cargo.toml b/bridges/modules/ethereum-contract/builtin/Cargo.toml index 0d34cf56444e..d17b0ba7e118 100644 --- a/bridges/modules/ethereum-contract/builtin/Cargo.toml +++ b/bridges/modules/ethereum-contract/builtin/Cargo.toml @@ -19,10 +19,10 @@ rialto-runtime = { path = "../../../bin/rialto/runtime" } # Substrate Dependencies -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/bridges/modules/ethereum/Cargo.toml b/bridges/modules/ethereum/Cargo.toml index b4a42e124cf5..449dbb709d12 100644 --- a/bridges/modules/ethereum/Cargo.toml +++ b/bridges/modules/ethereum/Cargo.toml @@ -17,12 +17,12 @@ bp-eth-poa = { path = "../../primitives/ethereum-poa", default-features = false # Substrate Dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [dev-dependencies] libsecp256k1 = { version = "0.3.4", features = ["hmac"] } diff --git a/bridges/modules/finality-verifier/Cargo.toml b/bridges/modules/finality-verifier/Cargo.toml index 6632066df878..800af5058d98 100644 --- a/bridges/modules/finality-verifier/Cargo.toml +++ b/bridges/modules/finality-verifier/Cargo.toml @@ -19,15 +19,15 @@ bp-header-chain = { path = "../../primitives/header-chain", default-features = f # Substrate Dependencies -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [dev-dependencies] bp-test-utils = {path = "../../primitives/test-utils" } pallet-substrate-bridge = { path = "../../modules/substrate" } -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } [features] default = ["std"] diff --git a/bridges/modules/message-lane/Cargo.toml b/bridges/modules/message-lane/Cargo.toml index 1355669216aa..cb018542fecb 100644 --- a/bridges/modules/message-lane/Cargo.toml +++ b/bridges/modules/message-lane/Cargo.toml @@ -19,17 +19,17 @@ bp-runtime = { path = "../../primitives/runtime", default-features = false } # Substrate Dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [dev-dependencies] hex-literal = "0.3" -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" } [features] default = ["std"] diff --git a/bridges/modules/message-lane/rpc/Cargo.toml b/bridges/modules/message-lane/rpc/Cargo.toml index 28481a7ad883..23dac80b407c 100644 --- a/bridges/modules/message-lane/rpc/Cargo.toml +++ b/bridges/modules/message-lane/rpc/Cargo.toml @@ -21,9 +21,9 @@ bp-message-lane = { path = "../../../primitives/message-lane" } # Substrate Dependencies -sc-client-api = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-state-machine = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/bridges/modules/shift-session-manager/Cargo.toml b/bridges/modules/shift-session-manager/Cargo.toml index 835859841503..c87aa29bccfb 100644 --- a/bridges/modules/shift-session-manager/Cargo.toml +++ b/bridges/modules/shift-session-manager/Cargo.toml @@ -11,15 +11,15 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features = # Substrate Dependencies -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } serde = "1.0" [features] diff --git a/bridges/modules/substrate/Cargo.toml b/bridges/modules/substrate/Cargo.toml index 00ac25e4393e..e4693fe958ce 100644 --- a/bridges/modules/substrate/Cargo.toml +++ b/bridges/modules/substrate/Cargo.toml @@ -20,18 +20,18 @@ bp-runtime = { path = "../../primitives/runtime", default-features = false } # Substrate Dependencies -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-trie = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [dev-dependencies] bp-test-utils = {path = "../../primitives/test-utils" } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-state-machine = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } [features] default = ["std"] diff --git a/bridges/primitives/currency-exchange/Cargo.toml b/bridges/primitives/currency-exchange/Cargo.toml index 29089695b3b5..e95834dee2ce 100644 --- a/bridges/primitives/currency-exchange/Cargo.toml +++ b/bridges/primitives/currency-exchange/Cargo.toml @@ -11,9 +11,9 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features = # Substrate Dependencies -frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "master" } -sp-std = { git = "https://github.com/paritytech/substrate.git", default-features = false , branch = "master" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" } [features] default = ["std"] diff --git a/bridges/primitives/ethereum-poa/Cargo.toml b/bridges/primitives/ethereum-poa/Cargo.toml index 4090b8650fe8..afd1ea4168a8 100644 --- a/bridges/primitives/ethereum-poa/Cargo.toml +++ b/bridges/primitives/ethereum-poa/Cargo.toml @@ -24,10 +24,10 @@ triehash = { version = "0.8.2", default-features = false } # Substrate Dependencies -sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [dev-dependencies] hex-literal = "0.2" diff --git a/bridges/primitives/header-chain/Cargo.toml b/bridges/primitives/header-chain/Cargo.toml index 76f8a4525344..77095f14310a 100644 --- a/bridges/primitives/header-chain/Cargo.toml +++ b/bridges/primitives/header-chain/Cargo.toml @@ -13,11 +13,11 @@ serde = { version = "1.0", optional = true } # Substrate Dependencies -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [dev-dependencies] bp-test-utils = { path = "../test-utils" } diff --git a/bridges/primitives/kusama/Cargo.toml b/bridges/primitives/kusama/Cargo.toml index fd5e464494d5..2e731f3e6016 100644 --- a/bridges/primitives/kusama/Cargo.toml +++ b/bridges/primitives/kusama/Cargo.toml @@ -15,12 +15,12 @@ bp-runtime = { path = "../runtime", default-features = false } # Substrate Based Dependencies -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [features] default = ["std"] diff --git a/bridges/primitives/message-lane/Cargo.toml b/bridges/primitives/message-lane/Cargo.toml index 4fcc1fd30ba1..7eedaef69ca4 100644 --- a/bridges/primitives/message-lane/Cargo.toml +++ b/bridges/primitives/message-lane/Cargo.toml @@ -15,9 +15,9 @@ bp-runtime = { path = "../runtime", default-features = false } # Substrate Dependencies -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [features] default = ["std"] diff --git a/bridges/primitives/millau/Cargo.toml b/bridges/primitives/millau/Cargo.toml index 78fcaf6b9a87..a33d92d19e48 100644 --- a/bridges/primitives/millau/Cargo.toml +++ b/bridges/primitives/millau/Cargo.toml @@ -21,14 +21,14 @@ serde = { version = "1.0.101", optional = true, features = ["derive"] } # Substrate Based Dependencies -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-trie = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [features] default = ["std"] diff --git a/bridges/primitives/polkadot/Cargo.toml b/bridges/primitives/polkadot/Cargo.toml index 759f0fb550ab..b603b6867b9a 100644 --- a/bridges/primitives/polkadot/Cargo.toml +++ b/bridges/primitives/polkadot/Cargo.toml @@ -15,12 +15,12 @@ bp-runtime = { path = "../runtime", default-features = false } # Substrate Based Dependencies -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [features] default = ["std"] diff --git a/bridges/primitives/rialto/Cargo.toml b/bridges/primitives/rialto/Cargo.toml index f3dd0f3db87a..6a40e36aa5fb 100644 --- a/bridges/primitives/rialto/Cargo.toml +++ b/bridges/primitives/rialto/Cargo.toml @@ -15,12 +15,12 @@ bp-runtime = { path = "../runtime", default-features = false } # Substrate Based Dependencies -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [features] default = ["std"] diff --git a/bridges/primitives/runtime/Cargo.toml b/bridges/primitives/runtime/Cargo.toml index eef6f789e575..d5fcf5f24a1a 100644 --- a/bridges/primitives/runtime/Cargo.toml +++ b/bridges/primitives/runtime/Cargo.toml @@ -12,11 +12,11 @@ num-traits = { version = "0.2", default-features = false } # Substrate Dependencies -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [features] default = ["std"] diff --git a/bridges/primitives/test-utils/Cargo.toml b/bridges/primitives/test-utils/Cargo.toml index 2b9bb5cd191c..396e0e764635 100644 --- a/bridges/primitives/test-utils/Cargo.toml +++ b/bridges/primitives/test-utils/Cargo.toml @@ -8,6 +8,6 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] finality-grandpa = { version = "0.14.0" } bp-header-chain = { path = "../header-chain" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/bridges/relays/ethereum/Cargo.toml b/bridges/relays/ethereum/Cargo.toml index 6e0a18522fd1..add4687b7094 100644 --- a/bridges/relays/ethereum/Cargo.toml +++ b/bridges/relays/ethereum/Cargo.toml @@ -40,9 +40,9 @@ rialto-runtime = { path = "../../bin/rialto/runtime" } # Substrate Dependencies -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/bridges/relays/kusama-client/Cargo.toml b/bridges/relays/kusama-client/Cargo.toml index 6695758113ad..04958cf2b361 100644 --- a/bridges/relays/kusama-client/Cargo.toml +++ b/bridges/relays/kusama-client/Cargo.toml @@ -17,9 +17,9 @@ bp-kusama = { path = "../../primitives/kusama" } # Substrate Dependencies -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/bridges/relays/millau-client/Cargo.toml b/bridges/relays/millau-client/Cargo.toml index c05d44a42e92..5f9cbd170c93 100644 --- a/bridges/relays/millau-client/Cargo.toml +++ b/bridges/relays/millau-client/Cargo.toml @@ -17,9 +17,9 @@ millau-runtime = { path = "../../bin/millau/runtime" } # Substrate Dependencies -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/bridges/relays/polkadot-client/Cargo.toml b/bridges/relays/polkadot-client/Cargo.toml index 5a05aa0a2cf4..8764b6509b24 100644 --- a/bridges/relays/polkadot-client/Cargo.toml +++ b/bridges/relays/polkadot-client/Cargo.toml @@ -17,9 +17,9 @@ bp-polkadot = { path = "../../primitives/polkadot" } # Substrate Dependencies -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/bridges/relays/rialto-client/Cargo.toml b/bridges/relays/rialto-client/Cargo.toml index 6c90defe37a1..6142ba05c963 100644 --- a/bridges/relays/rialto-client/Cargo.toml +++ b/bridges/relays/rialto-client/Cargo.toml @@ -17,9 +17,9 @@ rialto-runtime = { path = "../../bin/rialto/runtime" } # Substrate Dependencies -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/bridges/relays/substrate-client/Cargo.toml b/bridges/relays/substrate-client/Cargo.toml index 75a8f63c1c06..58b314c04c94 100644 --- a/bridges/relays/substrate-client/Cargo.toml +++ b/bridges/relays/substrate-client/Cargo.toml @@ -23,15 +23,15 @@ relay-utils = { path = "../utils" } # Substrate Dependencies -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-version = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "master" } #[dev-dependencies] futures = "0.3.7" diff --git a/bridges/relays/substrate/Cargo.toml b/bridges/relays/substrate/Cargo.toml index 6ea5e839d8ef..120501e511fe 100644 --- a/bridges/relays/substrate/Cargo.toml +++ b/bridges/relays/substrate/Cargo.toml @@ -42,8 +42,8 @@ rialto-runtime = { path = "../../bin/rialto/runtime" } # Substrate Dependencies -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/bridges/relays/utils/Cargo.toml b/bridges/relays/utils/Cargo.toml index 01aa866ee43d..ce6a20bbc4fe 100644 --- a/bridges/relays/utils/Cargo.toml +++ b/bridges/relays/utils/Cargo.toml @@ -19,4 +19,4 @@ time = "0.2" # Substrate dependencies -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" } From 4be6a38ec388d1ed8d81e7338a135c78e682fddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Wed, 7 Apr 2021 21:06:24 +0200 Subject: [PATCH 17/25] Remove stale file --- node/network/pov-distribution/Cargo.toml | 25 ------------------------ 1 file changed, 25 deletions(-) delete mode 100644 node/network/pov-distribution/Cargo.toml diff --git a/node/network/pov-distribution/Cargo.toml b/node/network/pov-distribution/Cargo.toml deleted file mode 100644 index ae405638c4c6..000000000000 --- a/node/network/pov-distribution/Cargo.toml +++ /dev/null @@ -1,25 +0,0 @@ -[package] -name = "polkadot-pov-distribution" -version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2018" - -[dependencies] -futures = "0.3.12" -thiserror = "1.0.23" -tracing = "0.1.25" - -polkadot-primitives = { path = "../../../primitives" } -polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } -polkadot-node-subsystem-util = { path = "../../subsystem-util" } -polkadot-node-network-protocol = { path = "../../network/protocol" } - -[dev-dependencies] -assert_matches = "1.4.0" -env_logger = "0.8.1" -log = "0.4.13" - -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } - -polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } From df11d3b043b5eedd0d490422d4bbf626eb07c6c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Wed, 7 Apr 2021 21:14:25 +0200 Subject: [PATCH 18/25] Guide updates --- node/overseer/src/lib.rs | 1 - .../src/node/subsystems-and-jobs.md | 23 ++++++------------- .../src/types/overseer-protocol.md | 3 --- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/node/overseer/src/lib.rs b/node/overseer/src/lib.rs index fe372c775de1..0f82e0e6dae6 100644 --- a/node/overseer/src/lib.rs +++ b/node/overseer/src/lib.rs @@ -913,7 +913,6 @@ impl OverseerHandler { } /// Wait for a block with the given hash to be in the active-leaves set. - /// This method is used for external code like `Proposer` that doesn't subscribe to Overseer's signals. /// /// The response channel responds if the hash was activated and is closed if the hash was deactivated. /// Note that due the fact the overseer doesn't store the whole active-leaves set, only deltas, diff --git a/roadmap/implementers-guide/src/node/subsystems-and-jobs.md b/roadmap/implementers-guide/src/node/subsystems-and-jobs.md index 2eabf6fc9eee..bffee1ffd2b1 100644 --- a/roadmap/implementers-guide/src/node/subsystems-and-jobs.md +++ b/roadmap/implementers-guide/src/node/subsystems-and-jobs.md @@ -380,7 +380,7 @@ sequenceDiagram participant CB as CandidateBacking participant BD as BitfieldDistribution participant RA as RuntimeApi - participant PO as Proposer + participant PI as ParachainsInherentDataProvider alt receive provisionable data alt @@ -395,33 +395,24 @@ sequenceDiagram Note over PV: store bitfields and backed candidates else receive request for inherent data - PO ->> PV: RequestInherentData + PI ->> PV: RequestInherentData alt we have already constructed the inherent data - PV ->> PO: send the inherent data + PV ->> PI: send the inherent data else we have not yet constructed the inherent data - Note over PV,PO: Store the return sender without sending immediately + Note over PV,PI: Store the return sender without sending immediately end else timer times out note over PV: Waited 2 seconds PV -->> RA: RuntimeApiRequest::AvailabilityCores Note over PV: construct and store the inherent data loop over stored inherent data requests - PV ->> PO: (SignedAvailabilityBitfields, BackedCandidates) + PV ->> PI: (SignedAvailabilityBitfields, BackedCandidates) end end ``` In principle, any arbitrary subsystem could send a `RequestInherentData` to the `Provisioner`. In practice, -only the `Proposer` does so. +only the `ParachainsInherentDataProvider` does so. -The proposer is an atypical subsystem in that, unlike most of them, it is not primarily driven by -the `Overseer`, but instead by the `sp_consensus::Environment` and `sp_consensus::Proposer` traits -from Substrate. It doesn't make much sense to diagram this flow because it's very linear: - -- Substrate creates a `Proposer` from the `ProposerFactory` once per upcoming block, using the `parent_header: Header`. -- At some later point, it calls `Proposer::propose(self, ...)`, consuming the proposer to generate a proposal -- `Proposer::propose` sends a `RequestInherentData` to the `Provisioner`. This has a fixed timeout of - 2.5 seconds, meaning that the provisioner has approximately 0.5 seconds to generate and send the data. - -The tuple `(SignedAvailabilityBitfields, BackedCandidates, ParentHeader)` is injected by the `Proposer` +The tuple `(SignedAvailabilityBitfields, BackedCandidates, ParentHeader)` is injected by the `ParachainsInherentDataProvider` into the inherent data. From that point on, control passes from the node to the runtime. diff --git a/roadmap/implementers-guide/src/types/overseer-protocol.md b/roadmap/implementers-guide/src/types/overseer-protocol.md index c4d51a611042..9e082b8d1b6a 100644 --- a/roadmap/implementers-guide/src/types/overseer-protocol.md +++ b/roadmap/implementers-guide/src/types/overseer-protocol.md @@ -564,9 +564,6 @@ enum ProvisionerMessage { /// advancing the state of parachain consensus in a block building upon the given hash. /// /// If called at different points in time, this may give different results. - /// - /// This is expected to be used by a proposer, to inject that information into the InherentData - /// where it can be assembled into the ParaInherent. RequestInherentData(Hash, oneshot::Sender), /// This data should become part of a relay chain block ProvisionableData(ProvisionableData), From 5b4438b99db60956c5b47055c7effd538566724f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Wed, 7 Apr 2021 22:24:07 +0200 Subject: [PATCH 19/25] Update node/core/parachains-inherent/src/lib.rs Co-authored-by: Andronik Ordian --- node/core/parachains-inherent/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/core/parachains-inherent/src/lib.rs b/node/core/parachains-inherent/src/lib.rs index 5205126a0a85..dcfd38584b26 100644 --- a/node/core/parachains-inherent/src/lib.rs +++ b/node/core/parachains-inherent/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2020 Parity Technologies (UK) Ltd. +// Copyright 2021 Parity Technologies (UK) Ltd. // This file is part of Polkadot. // Polkadot is free software: you can redistribute it and/or modify From 5cdc7a1cdb0deb3b11658e38abe55951004f28b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Wed, 7 Apr 2021 22:26:32 +0200 Subject: [PATCH 20/25] Update node/core/parachains-inherent/src/lib.rs Co-authored-by: Andronik Ordian --- node/core/parachains-inherent/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/core/parachains-inherent/src/lib.rs b/node/core/parachains-inherent/src/lib.rs index dcfd38584b26..9c6b8ed0dbb5 100644 --- a/node/core/parachains-inherent/src/lib.rs +++ b/node/core/parachains-inherent/src/lib.rs @@ -18,7 +18,7 @@ //! //! Parachain backing and approval is an off-chain process, but the parachain needs to progress on chain as well. To //! make it progress on chain a block producer needs to forward information about the state of a parachain to the -//! runtime. These information are forwarded through an inherent to the runtime. Here we provide the +//! runtime. This information is forwarded through an inherent to the runtime. Here we provide the //! [`ParachainInherentDataProvider`] that requests the relevant data from the provisioner subsystem and creates the //! the inherent data that the runtime will use to create an inherent. From 23cae57b2d845cecd1c6700eff6dc5f1fd3a81d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Wed, 7 Apr 2021 22:34:31 +0200 Subject: [PATCH 21/25] Apply suggestions from code review --- bridges/primitives/currency-exchange/Cargo.toml | 6 +++--- bridges/relays/ethereum-client/Cargo.toml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bridges/primitives/currency-exchange/Cargo.toml b/bridges/primitives/currency-exchange/Cargo.toml index e95834dee2ce..904f9c2ce4ee 100644 --- a/bridges/primitives/currency-exchange/Cargo.toml +++ b/bridges/primitives/currency-exchange/Cargo.toml @@ -11,9 +11,9 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features = # Substrate Dependencies -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [features] default = ["std"] diff --git a/bridges/relays/ethereum-client/Cargo.toml b/bridges/relays/ethereum-client/Cargo.toml index 11412e014b2d..a698cbfb893d 100644 --- a/bridges/relays/ethereum-client/Cargo.toml +++ b/bridges/relays/ethereum-client/Cargo.toml @@ -10,8 +10,8 @@ bp-eth-poa = { path = "../../primitives/ethereum-poa" } codec = { package = "parity-scale-codec", version = "2.0.0" } headers-relay = { path = "../headers-relay" } hex-literal = "0.3" -jsonrpsee = { git = "https://github.com/svyatonik/jsonrpsee.git", branch = "master", default-features = false, features = ["http"] } +jsonrpsee = { git = "https://github.com/svyatonik/jsonrpsee.git", branch = "shared-client-in-rpc-api", default-features = false, features = ["http"] } libsecp256k1 = { version = "0.3.4", default-features = false, features = ["hmac"] } log = "0.4.11" relay-utils = { path = "../utils" } -web3 = { version = "0.15", git = "https://github.com/tomusdrw/rust-web3.git", default-features = false, branch = "master" } +web3 = { version = "0.15", git = "https://github.com/tomusdrw/rust-web3.git", branch = "td-ethabi", default-features = false } From 5688165479948d00d1b61ecc42aa39cb37b450cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 3 May 2021 12:45:33 +0200 Subject: [PATCH 22/25] Reset accidental changes --- bridges/bin/millau/node/Cargo.toml | 2 +- bridges/bin/rialto/node/Cargo.toml | 2 +- bridges/bin/runtime-common/Cargo.toml | 12 ++++++------ bridges/modules/currency-exchange/Cargo.toml | 10 +++++----- bridges/modules/dispatch/Cargo.toml | 10 +++++----- bridges/modules/ethereum/Cargo.toml | 12 ++++++------ bridges/modules/grandpa/Cargo.toml | 12 ++++++------ bridges/modules/messages/Cargo.toml | 12 ++++++------ bridges/modules/shift-session-manager/Cargo.toml | 10 +++++----- bridges/primitives/chain-millau/Cargo.toml | 16 ++++++++-------- bridges/primitives/chain-rialto/Cargo.toml | 12 ++++++------ bridges/primitives/currency-exchange/Cargo.toml | 6 +++--- bridges/primitives/ethereum-poa/Cargo.toml | 8 ++++---- bridges/primitives/header-chain/Cargo.toml | 10 +++++----- bridges/primitives/messages/Cargo.toml | 6 +++--- bridges/primitives/polkadot-core/Cargo.toml | 6 +++--- 16 files changed, 73 insertions(+), 73 deletions(-) diff --git a/bridges/bin/millau/node/Cargo.toml b/bridges/bin/millau/node/Cargo.toml index 4fd4ec9b43da..e31e2c871a50 100644 --- a/bridges/bin/millau/node/Cargo.toml +++ b/bridges/bin/millau/node/Cargo.toml @@ -28,7 +28,7 @@ frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", bran node-inspect = { git = "https://github.com/paritytech/substrate", branch = "master" } pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-cli = { git = "https://github.com/paritytech/substrate", features = ["wasmtime"] , branch = "master" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["wasmtime"] } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/bridges/bin/rialto/node/Cargo.toml b/bridges/bin/rialto/node/Cargo.toml index b4bd2613aa3e..a51ee7a5ab5f 100644 --- a/bridges/bin/rialto/node/Cargo.toml +++ b/bridges/bin/rialto/node/Cargo.toml @@ -29,7 +29,7 @@ frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", bran node-inspect = { git = "https://github.com/paritytech/substrate", branch = "master" } pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-cli = { git = "https://github.com/paritytech/substrate", features = ["wasmtime"] , branch = "master" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["wasmtime"] } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/bridges/bin/runtime-common/Cargo.toml b/bridges/bin/runtime-common/Cargo.toml index 81d0842b03b4..83803d06deb5 100644 --- a/bridges/bin/runtime-common/Cargo.toml +++ b/bridges/bin/runtime-common/Cargo.toml @@ -23,12 +23,12 @@ pallet-bridge-messages = { path = "../../modules/messages", default-features = f # Substrate dependencies -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } [features] default = ["std"] diff --git a/bridges/modules/currency-exchange/Cargo.toml b/bridges/modules/currency-exchange/Cargo.toml index 5c76529bafb2..8094f0f2b6ee 100644 --- a/bridges/modules/currency-exchange/Cargo.toml +++ b/bridges/modules/currency-exchange/Cargo.toml @@ -18,11 +18,11 @@ bp-header-chain = { path = "../../primitives/header-chain", default-features = f # Substrate Dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true } [dev-dependencies] sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/bridges/modules/dispatch/Cargo.toml b/bridges/modules/dispatch/Cargo.toml index b49fa1f364d9..6170af272ad9 100644 --- a/bridges/modules/dispatch/Cargo.toml +++ b/bridges/modules/dispatch/Cargo.toml @@ -17,11 +17,11 @@ bp-runtime = { path = "../../primitives/runtime", default-features = false } # Substrate Dependencies -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } [dev-dependencies] sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/bridges/modules/ethereum/Cargo.toml b/bridges/modules/ethereum/Cargo.toml index ce879eb1cd15..fdd93ed73311 100644 --- a/bridges/modules/ethereum/Cargo.toml +++ b/bridges/modules/ethereum/Cargo.toml @@ -18,12 +18,12 @@ bp-eth-poa = { path = "../../primitives/ethereum-poa", default-features = false # Substrate Dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } [dev-dependencies] libsecp256k1 = { version = "0.3.4", features = ["hmac"] } diff --git a/bridges/modules/grandpa/Cargo.toml b/bridges/modules/grandpa/Cargo.toml index 231a0336677e..810dce3dd5a4 100644 --- a/bridges/modules/grandpa/Cargo.toml +++ b/bridges/modules/grandpa/Cargo.toml @@ -21,12 +21,12 @@ bp-header-chain = { path = "../../primitives/header-chain", default-features = f # Substrate Dependencies -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } # Optional Benchmarking Dependencies bp-test-utils = { path = "../../primitives/test-utils", default-features = false, optional = true } diff --git a/bridges/modules/messages/Cargo.toml b/bridges/modules/messages/Cargo.toml index 3c25f91f005d..4a75fa8181f8 100644 --- a/bridges/modules/messages/Cargo.toml +++ b/bridges/modules/messages/Cargo.toml @@ -20,12 +20,12 @@ bp-runtime = { path = "../../primitives/runtime", default-features = false } # Substrate Dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } [dev-dependencies] hex = "0.4" diff --git a/bridges/modules/shift-session-manager/Cargo.toml b/bridges/modules/shift-session-manager/Cargo.toml index c87aa29bccfb..6dac97ddde60 100644 --- a/bridges/modules/shift-session-manager/Cargo.toml +++ b/bridges/modules/shift-session-manager/Cargo.toml @@ -11,11 +11,11 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features = # Substrate Dependencies -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } [dev-dependencies] sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/bridges/primitives/chain-millau/Cargo.toml b/bridges/primitives/chain-millau/Cargo.toml index 8205a800ef39..67db08c20860 100644 --- a/bridges/primitives/chain-millau/Cargo.toml +++ b/bridges/primitives/chain-millau/Cargo.toml @@ -21,14 +21,14 @@ serde = { version = "1.0.101", optional = true, features = ["derive"] } # Substrate Based Dependencies -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } [features] default = ["std"] diff --git a/bridges/primitives/chain-rialto/Cargo.toml b/bridges/primitives/chain-rialto/Cargo.toml index d16ac59484fb..7e039a40acd9 100644 --- a/bridges/primitives/chain-rialto/Cargo.toml +++ b/bridges/primitives/chain-rialto/Cargo.toml @@ -15,12 +15,12 @@ bp-runtime = { path = "../runtime", default-features = false } # Substrate Based Dependencies -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } [features] default = ["std"] diff --git a/bridges/primitives/currency-exchange/Cargo.toml b/bridges/primitives/currency-exchange/Cargo.toml index 904f9c2ce4ee..43367ba7992b 100644 --- a/bridges/primitives/currency-exchange/Cargo.toml +++ b/bridges/primitives/currency-exchange/Cargo.toml @@ -11,9 +11,9 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features = # Substrate Dependencies -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } [features] default = ["std"] diff --git a/bridges/primitives/ethereum-poa/Cargo.toml b/bridges/primitives/ethereum-poa/Cargo.toml index afd1ea4168a8..cd2c3a97a0f3 100644 --- a/bridges/primitives/ethereum-poa/Cargo.toml +++ b/bridges/primitives/ethereum-poa/Cargo.toml @@ -24,10 +24,10 @@ triehash = { version = "0.8.2", default-features = false } # Substrate Dependencies -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } [dev-dependencies] hex-literal = "0.2" diff --git a/bridges/primitives/header-chain/Cargo.toml b/bridges/primitives/header-chain/Cargo.toml index 77095f14310a..dc58dafb979e 100644 --- a/bridges/primitives/header-chain/Cargo.toml +++ b/bridges/primitives/header-chain/Cargo.toml @@ -13,11 +13,11 @@ serde = { version = "1.0", optional = true } # Substrate Dependencies -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } [dev-dependencies] bp-test-utils = { path = "../test-utils" } diff --git a/bridges/primitives/messages/Cargo.toml b/bridges/primitives/messages/Cargo.toml index 6e90ea52ae92..9cb037a34ce8 100644 --- a/bridges/primitives/messages/Cargo.toml +++ b/bridges/primitives/messages/Cargo.toml @@ -15,9 +15,9 @@ bp-runtime = { path = "../runtime", default-features = false } # Substrate Dependencies -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } [features] default = ["std"] diff --git a/bridges/primitives/polkadot-core/Cargo.toml b/bridges/primitives/polkadot-core/Cargo.toml index 16392347d172..995f948e5d47 100644 --- a/bridges/primitives/polkadot-core/Cargo.toml +++ b/bridges/primitives/polkadot-core/Cargo.toml @@ -16,9 +16,9 @@ bp-runtime = { path = "../runtime", default-features = false } # Substrate Based Dependencies -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } From 62ce24a44eb945fc214d030405cf1c1a39255f00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 3 May 2021 12:50:16 +0200 Subject: [PATCH 23/25] More --- bridges/modules/finality-verifier/Cargo.toml | 44 ------------------- cli/Cargo.toml | 12 ++--- node/network/approval-distribution/Cargo.toml | 2 +- .../availability-distribution/Cargo.toml | 6 +-- node/network/collator-protocol/Cargo.toml | 2 +- node/test/service/Cargo.toml | 4 +- 6 files changed, 13 insertions(+), 57 deletions(-) delete mode 100644 bridges/modules/finality-verifier/Cargo.toml diff --git a/bridges/modules/finality-verifier/Cargo.toml b/bridges/modules/finality-verifier/Cargo.toml deleted file mode 100644 index 800af5058d98..000000000000 --- a/bridges/modules/finality-verifier/Cargo.toml +++ /dev/null @@ -1,44 +0,0 @@ -[package] -name = "pallet-finality-verifier" -version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2018" -license = "GPL-3.0-or-later WITH Classpath-exception-2.0" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -finality-grandpa = { version = "0.14.0", default-features = false } -serde = { version = "1.0", optional = true } - -# Bridge Dependencies - -bp-runtime = { path = "../../primitives/runtime", default-features = false } -bp-header-chain = { path = "../../primitives/header-chain", default-features = false } - -# Substrate Dependencies - -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } - -[dev-dependencies] -bp-test-utils = {path = "../../primitives/test-utils" } -pallet-substrate-bridge = { path = "../../modules/substrate" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } - -[features] -default = ["std"] -std = [ - "bp-runtime/std", - "bp-header-chain/std", - "codec/std", - "finality-grandpa/std", - "frame-support/std", - "frame-system/std", - "serde", - "sp-runtime/std", - "sp-std/std", -] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 69bf2904ce32..121a575ed140 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -25,15 +25,15 @@ service = { package = "polkadot-service", path = "../node/service", default-feat polkadot-node-core-pvf = { path = "../node/core/pvf", optional = true } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", optional = true , branch = "master" } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", optional = true , branch = "master" } -sc-cli = { git = "https://github.com/paritytech/substrate", optional = true , branch = "master" } -sc-service = { git = "https://github.com/paritytech/substrate", optional = true , branch = "master" } -browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", optional = true , branch = "master" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } +try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } +browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", branch = "master", optional = true } # this crate is used only to enable `trie-memory-tracker` feature # see https://github.com/paritytech/substrate/pull/6745 -sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [build-dependencies] substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/node/network/approval-distribution/Cargo.toml b/node/network/approval-distribution/Cargo.toml index cebd7b0e0ddd..900582aa988e 100644 --- a/node/network/approval-distribution/Cargo.toml +++ b/node/network/approval-distribution/Cargo.toml @@ -15,7 +15,7 @@ futures = "0.3.8" tracing = "0.1.25" [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", features = ["std"] , branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] } polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } diff --git a/node/network/availability-distribution/Cargo.toml b/node/network/availability-distribution/Cargo.toml index 5f58145d7a12..9242ea10e42e 100644 --- a/node/network/availability-distribution/Cargo.toml +++ b/node/network/availability-distribution/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] futures = "0.3.12" tracing = "0.1.25" -parity-scale-codec = { version = "2.0.0", features = ["std"] } +parity-scale-codec = { version = "2.0.0", features = ["std"] } polkadot-primitives = { path = "../../../primitives" } polkadot-erasure-coding = { path = "../../../erasure-coding" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } @@ -16,7 +16,7 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-node-primitives = { path = "../../primitives" } polkadot-node-core-runtime-api = { path = "../../core/runtime-api" } sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", features = ["std"], branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] } sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } thiserror = "1.0.23" rand = "0.8.3" @@ -24,7 +24,7 @@ lru = "0.6.5" [dev-dependencies] polkadot-subsystem-testhelpers = { package = "polkadot-node-subsystem-test-helpers", path = "../../subsystem-test-helpers" } -sp-core = { git = "https://github.com/paritytech/substrate", features = ["std"] , branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] } sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/node/network/collator-protocol/Cargo.toml b/node/network/collator-protocol/Cargo.toml index 3be465269a83..817d6511b04c 100644 --- a/node/network/collator-protocol/Cargo.toml +++ b/node/network/collator-protocol/Cargo.toml @@ -26,7 +26,7 @@ log = "0.4.13" env_logger = "0.8.2" assert_matches = "1.4.0" -sp-core = { git = "https://github.com/paritytech/substrate", features = ["std"] , branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] } sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } polkadot-subsystem-testhelpers = { package = "polkadot-node-subsystem-test-helpers", path = "../../subsystem-test-helpers" } diff --git a/node/test/service/Cargo.toml b/node/test/service/Cargo.toml index cfab1baea31b..12dc0b25f3a0 100644 --- a/node/test/service/Cargo.toml +++ b/node/test/service/Cargo.toml @@ -46,7 +46,7 @@ sc-executor = { git = "https://github.com/paritytech/substrate", branch = "maste sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -service = { package = "sc-service", git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" } +service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } @@ -56,7 +56,7 @@ sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = " substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" } [dev-dependencies] -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } serde_json = "1.0.61" substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } tokio = { version = "0.2", features = ["macros"] } From 9f22695b2cf9514429e31ea6ae3e953dc9c182c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 3 May 2021 16:16:03 +0200 Subject: [PATCH 24/25] Remove stale file --- node/core/proposer/src/lib.rs | 311 ---------------------------------- 1 file changed, 311 deletions(-) delete mode 100644 node/core/proposer/src/lib.rs diff --git a/node/core/proposer/src/lib.rs b/node/core/proposer/src/lib.rs deleted file mode 100644 index 64ad751f561c..000000000000 --- a/node/core/proposer/src/lib.rs +++ /dev/null @@ -1,311 +0,0 @@ -// Copyright 2020 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. - -// Polkadot is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Polkadot is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . - -//! The proposer proposes new blocks to include - -#![deny(unused_crate_dependencies, unused_results)] - -use futures::prelude::*; -use futures::select; -use polkadot_node_subsystem::{ - jaeger, - messages::{AllMessages, ProvisionerInherentData, ProvisionerMessage}, SubsystemError, -}; -use polkadot_overseer::OverseerHandler; -use polkadot_primitives::v1::{ - Block, Hash, Header, InherentData as ParachainsInherentData, -}; -use sc_block_builder::{BlockBuilderApi, BlockBuilderProvider}; -use sc_telemetry::TelemetryHandle; -use sp_core::traits::SpawnNamed; -use sp_api::{ApiExt, ProvideRuntimeApi}; -use sp_blockchain::HeaderBackend; -use sp_consensus::{Proposal, DisableProofRecording}; -use sp_inherents::InherentData; -use sp_runtime::traits::{DigestFor, HashFor}; -use sp_transaction_pool::TransactionPool; -use prometheus_endpoint::Registry as PrometheusRegistry; -use std::{fmt, pin::Pin, sync::Arc, time}; - -/// How long proposing can take, before we give up and err out. We need a relatively large timeout -/// here as long as we have large payload in statement distribution. Assuming we can reach most -/// nodes within two hops, we will take about 2 seconds for transferring statements (data transfer -/// only). If necessary, we could be able to reduce this to 3 seconds. To consider: The lower the -/// riskier that we will not be able to include a candidate. -const PROPOSE_TIMEOUT: core::time::Duration = core::time::Duration::from_millis(4000); - -/// Custom Proposer factory for Polkadot -pub struct ProposerFactory { - inner: sc_basic_authorship::ProposerFactory, - overseer: OverseerHandler, -} - -impl ProposerFactory { - pub fn new( - spawn_handle: impl SpawnNamed + 'static, - client: Arc, - transaction_pool: Arc, - overseer: OverseerHandler, - prometheus: Option<&PrometheusRegistry>, - telemetry: Option, - ) -> Self { - ProposerFactory { - inner: sc_basic_authorship::ProposerFactory::new( - spawn_handle, - client, - transaction_pool, - prometheus, - telemetry, - ), - overseer, - } - } -} - -impl sp_consensus::Environment - for ProposerFactory -where - TxPool: 'static + TransactionPool, - Client: 'static - + BlockBuilderProvider - + ProvideRuntimeApi - + HeaderBackend - + Send - + Sync, - Client::Api: - BlockBuilderApi + ApiExt, - Backend: - 'static + sc_client_api::Backend>, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - sp_api::StateBackendFor: sp_api::StateBackend> + Send, -{ - type CreateProposer = Pin> + Send + 'static, - >>; - type Proposer = Proposer; - type Error = Error; - - fn init(&mut self, parent_header: &Header) -> Self::CreateProposer { - // create the inner proposer - let proposer = self.inner.init(parent_header).into_inner(); - - // data to be moved into the future - let overseer = self.overseer.clone(); - let parent_header_hash = parent_header.hash(); - let parent_header = parent_header.clone(); - - async move { - Ok(Proposer { - inner: proposer?, - overseer, - parent_header, - parent_header_hash, - }) - }.boxed() - } -} - -/// Custom Proposer for Polkadot. -/// -/// This proposer gets the ProvisionerInherentData and injects it into the wrapped -/// proposer's inherent data, then delegates the actual proposal generation. -pub struct Proposer, Backend, Client> { - inner: sc_basic_authorship::Proposer, - overseer: OverseerHandler, - parent_header: Header, - parent_header_hash: Hash, -} - -// This impl has the same generic bounds as the Proposer impl. -impl Proposer -where - TxPool: 'static + TransactionPool, - Client: 'static - + BlockBuilderProvider - + ProvideRuntimeApi - + HeaderBackend - + Send - + Sync, - Client::Api: - BlockBuilderApi + ApiExt, - Backend: - 'static + sc_client_api::Backend>, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - sp_api::StateBackendFor: sp_api::StateBackend> + Send, -{ - /// Get provisioner inherent data - /// - /// This function has a constant timeout: `PROPOSE_TIMEOUT`. - async fn get_provisioner_data(&self) -> Result { - // clone this (lightweight) data because we're going to move it into the future - let mut overseer = self.overseer.clone(); - let parent_header_hash = self.parent_header_hash.clone(); - - let pid = async { - let (sender, receiver) = futures::channel::oneshot::channel(); - overseer.wait_for_activation(parent_header_hash, sender).await; - receiver.await.map_err(|_| Error::ClosedChannelAwaitingActivation)??; - - let (sender, receiver) = futures::channel::oneshot::channel(); - overseer.send_msg(AllMessages::Provisioner( - ProvisionerMessage::RequestInherentData(parent_header_hash, sender), - )).await; - - receiver.await.map_err(|_| Error::ClosedChannelAwaitingInherentData) - }; - - let mut timeout = futures_timer::Delay::new(PROPOSE_TIMEOUT).fuse(); - - select! { - pid = pid.fuse() => pid, - _ = timeout => Err(Error::Timeout), - } - } -} - -impl sp_consensus::Proposer for Proposer -where - TxPool: 'static + TransactionPool, - Client: 'static - + BlockBuilderProvider - + ProvideRuntimeApi - + HeaderBackend - + Send - + Sync, - Client::Api: - BlockBuilderApi + ApiExt, - Backend: - 'static + sc_client_api::Backend>, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - sp_api::StateBackendFor: sp_api::StateBackend> + Send, -{ - type Transaction = sc_client_api::TransactionFor; - type Proposal = Pin, ()>, Error>> + Send, - >>; - type Error = Error; - type ProofRecording = DisableProofRecording; - type Proof = (); - - fn propose( - self, - mut inherent_data: InherentData, - inherent_digests: DigestFor, - max_duration: time::Duration, - block_size_limit: Option, - ) -> Self::Proposal { - async move { - let span = jaeger::Span::new(self.parent_header_hash, "propose"); - let _span = span.child("get-provisioner"); - - let parachains_inherent_data = match self.get_provisioner_data().await { - Ok(pd) => ParachainsInherentData { - bitfields: pd.bitfields, - backed_candidates: pd.backed_candidates, - disputes: pd.disputes, - parent_header: self.parent_header, - }, - Err(err) => { - tracing::warn!(err = ?err, "could not get provisioner inherent data; injecting default data"); - ParachainsInherentData { - bitfields: Vec::new(), - backed_candidates: Vec::new(), - disputes: Vec::new(), - parent_header: self.parent_header, - } - } - }; - - drop(_span); - - inherent_data.put_data( - polkadot_primitives::v1::PARACHAINS_INHERENT_IDENTIFIER, - ¶chains_inherent_data, - )?; - - let _span = span.child("authorship-propose"); - self.inner - .propose(inherent_data, inherent_digests, max_duration, block_size_limit) - .await - .map_err(Into::into) - } - .boxed() - } -} - -// It would have been more ergonomic to use thiserror to derive the -// From implementations, Display, and std::error::Error, but unfortunately -// one of the wrapped errors (sp_inherents::Error) also -// don't impl std::error::Error, which breaks the thiserror derive. -#[derive(Debug)] -pub enum Error { - Consensus(sp_consensus::Error), - Blockchain(sp_blockchain::Error), - Inherent(sp_inherents::Error), - Timeout, - ClosedChannelAwaitingActivation, - ClosedChannelAwaitingInherentData, - Subsystem(SubsystemError) -} - -impl From for Error { - fn from(e: sp_consensus::Error) -> Error { - Error::Consensus(e) - } -} - -impl From for Error { - fn from(e: sp_blockchain::Error) -> Error { - Error::Blockchain(e) - } -} - -impl From for Error { - fn from(e: sp_inherents::Error) -> Error { - Error::Inherent(e) - } -} - -impl From for Error { - fn from(e: SubsystemError) -> Error { - Error::Subsystem(e) - } -} - -impl fmt::Display for Error { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - match self { - Self::Consensus(err) => write!(f, "consensus error: {}", err), - Self::Blockchain(err) => write!(f, "blockchain error: {}", err), - Self::Inherent(err) => write!(f, "inherent error: {:?}", err), - Self::Timeout => write!(f, "timeout: provisioner did not return inherent data after {:?}", PROPOSE_TIMEOUT), - Self::ClosedChannelAwaitingActivation => write!(f, "closed channel from overseer when awaiting activation"), - Self::ClosedChannelAwaitingInherentData => write!(f, "closed channel from provisioner when awaiting inherent data"), - Self::Subsystem(err) => write!(f, "subsystem error: {:?}", err), - } - } -} - -impl std::error::Error for Error { - fn source(&self) -> Option<&(dyn std::error::Error + 'static)> { - match self { - Self::Consensus(err) => Some(err), - Self::Blockchain(err) => Some(err), - Self::Subsystem(err) => Some(err), - _ => None - } - } -} From c683b220d0f06b2e586bcbca50b51d3762398b96 Mon Sep 17 00:00:00 2001 From: parity-processbot <> Date: Mon, 3 May 2021 14:39:37 +0000 Subject: [PATCH 25/25] update Substrate --- Cargo.lock | 320 +++++++++++++++++++++++++++-------------------------- 1 file changed, 161 insertions(+), 159 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4d4eea3f9579..03d27165118d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,7 +1,5 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 - [[package]] name = "Inflector" version = "0.11.4" @@ -1864,7 +1862,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "parity-scale-codec", ] @@ -1882,7 +1880,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "3.1.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-support", "frame-system", @@ -1901,7 +1899,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "Inflector", "chrono", @@ -1924,7 +1922,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-support", "frame-system", @@ -1937,7 +1935,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-support", "frame-system", @@ -1952,7 +1950,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "13.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "parity-scale-codec", "serde", @@ -1963,7 +1961,7 @@ dependencies = [ [[package]] name = "frame-support" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "bitflags", "frame-metadata", @@ -1989,7 +1987,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2001,7 +1999,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.0.0", @@ -2013,7 +2011,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "proc-macro2", "quote", @@ -2023,7 +2021,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-metadata", "frame-support", @@ -2033,7 +2031,6 @@ dependencies = [ "rustversion", "serde", "sp-core", - "sp-inherents", "sp-io", "sp-runtime", "sp-state-machine", @@ -2044,7 +2041,7 @@ dependencies = [ [[package]] name = "frame-system" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -2061,7 +2058,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-support", @@ -2075,7 +2072,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "parity-scale-codec", "sp-api", @@ -2084,7 +2081,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-support", "parity-scale-codec", @@ -4467,7 +4464,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b" [[package]] name = "pallet-authority-discovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-support", "frame-system", @@ -4482,14 +4479,13 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "parity-scale-codec", "sp-authorship", - "sp-inherents", "sp-runtime", "sp-std", ] @@ -4497,7 +4493,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-support", @@ -4520,7 +4516,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-support", @@ -4549,7 +4545,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-support", @@ -4563,7 +4559,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-support", @@ -4579,7 +4575,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-support", @@ -4594,7 +4590,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4614,7 +4610,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-support", @@ -4631,7 +4627,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-support", @@ -4652,7 +4648,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4667,7 +4663,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-support", @@ -4686,7 +4682,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-support", @@ -4702,7 +4698,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-support", @@ -4717,7 +4713,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -4734,7 +4730,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-support", "frame-system", @@ -4750,7 +4746,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4768,7 +4764,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-support", @@ -4783,7 +4779,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-support", "frame-system", @@ -4796,7 +4792,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-support", "frame-system", @@ -4812,7 +4808,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4834,7 +4830,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-support", @@ -4849,7 +4845,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-support", "frame-system", @@ -4862,7 +4858,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "enumflags2", "frame-support", @@ -4876,7 +4872,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-support", @@ -4891,7 +4887,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-support", "frame-system", @@ -4910,7 +4906,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-support", @@ -4926,7 +4922,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-support", "frame-system", @@ -4939,7 +4935,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4963,7 +4959,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -4974,7 +4970,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-support", "frame-system", @@ -4987,7 +4983,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-support", @@ -5005,7 +5001,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-support", @@ -5020,7 +5016,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-support", "frame-system", @@ -5036,7 +5032,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5053,7 +5049,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5064,7 +5060,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-support", @@ -5080,7 +5076,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-benchmarking", "frame-support", @@ -5095,7 +5091,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5943,6 +5939,7 @@ dependencies = [ name = "polkadot-node-core-parachains-inherent" version = "0.1.0" dependencies = [ + "async-trait", "futures 0.3.14", "futures-timer 3.0.2", "polkadot-node-subsystem", @@ -7315,7 +7312,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "env_logger 0.8.2", "hex-literal", @@ -7600,7 +7597,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "async-trait", "derive_more", @@ -7629,7 +7626,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "futures 0.3.14", "futures-timer 3.0.2", @@ -7652,7 +7649,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -7668,7 +7665,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7689,7 +7686,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -7700,7 +7697,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "chrono", "fdlimit", @@ -7738,7 +7735,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "derive_more", "fnv", @@ -7772,7 +7769,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "blake2-rfc", "hash-db", @@ -7802,7 +7799,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "parking_lot 0.11.1", "sc-client-api", @@ -7814,7 +7811,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "async-trait", "derive_more", @@ -7852,7 +7849,6 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-timestamp", "sp-utils", "sp-version", "substrate-prometheus-endpoint", @@ -7861,7 +7857,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "derive_more", "futures 0.3.14", @@ -7885,7 +7881,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "fork-tree", "parity-scale-codec", @@ -7898,11 +7894,12 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "async-trait", "futures 0.3.14", "futures-timer 3.0.2", + "impl-trait-for-tuples", "log", "parity-scale-codec", "sc-client-api", @@ -7925,21 +7922,18 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ - "log", "sc-client-api", "sp-authorship", - "sp-consensus", - "sp-core", - "sp-inherents", "sp-runtime", + "thiserror", ] [[package]] name = "sc-executor" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "derive_more", "lazy_static", @@ -7969,7 +7963,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "derive_more", "parity-scale-codec", @@ -7986,7 +7980,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "log", "parity-scale-codec", @@ -8001,7 +7995,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "log", "parity-scale-codec", @@ -8019,7 +8013,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "async-trait", "derive_more", @@ -8059,7 +8053,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "derive_more", "finality-grandpa", @@ -8083,7 +8077,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-warp-sync" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "derive_more", "futures 0.3.14", @@ -8104,7 +8098,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "ansi_term 0.12.1", "futures 0.3.14", @@ -8122,7 +8116,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "async-trait", "derive_more", @@ -8142,7 +8136,7 @@ dependencies = [ [[package]] name = "sc-light" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "hash-db", "lazy_static", @@ -8161,7 +8155,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "async-std", "async-trait", @@ -8214,7 +8208,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "futures 0.3.14", "futures-timer 3.0.2", @@ -8231,7 +8225,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "bytes 0.5.6", "fnv", @@ -8259,7 +8253,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "futures 0.3.14", "libp2p", @@ -8272,7 +8266,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8281,7 +8275,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "futures 0.3.14", "hash-db", @@ -8315,7 +8309,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "derive_more", "futures 0.3.14", @@ -8339,7 +8333,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "futures 0.1.29", "jsonrpc-core", @@ -8357,7 +8351,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "async-trait", "directories", @@ -8421,7 +8415,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "log", "parity-scale-codec", @@ -8436,7 +8430,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -8456,7 +8450,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "chrono", "futures 0.3.14", @@ -8476,7 +8470,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "ansi_term 0.12.1", "atty", @@ -8503,7 +8497,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -8514,7 +8508,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "derive_more", "futures 0.3.14", @@ -8536,7 +8530,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "futures 0.3.14", "futures-diagnose", @@ -8958,7 +8952,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "log", "sp-core", @@ -8970,7 +8964,7 @@ dependencies = [ [[package]] name = "sp-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "hash-db", "log", @@ -8987,7 +8981,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "blake2-rfc", "proc-macro-crate 1.0.0", @@ -8999,7 +8993,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "parity-scale-codec", "serde", @@ -9011,7 +9005,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "integer-sqrt", "num-traits", @@ -9025,7 +9019,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "parity-scale-codec", "sp-api", @@ -9037,8 +9031,9 @@ dependencies = [ [[package]] name = "sp-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ + "async-trait", "parity-scale-codec", "sp-inherents", "sp-runtime", @@ -9048,7 +9043,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "parity-scale-codec", "sp-api", @@ -9060,7 +9055,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "futures 0.3.14", "log", @@ -9078,7 +9073,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "serde", "serde_json", @@ -9087,7 +9082,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "async-trait", "futures 0.3.14", @@ -9114,8 +9109,9 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ + "async-trait", "merlin", "parity-scale-codec", "serde", @@ -9135,7 +9131,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -9145,7 +9141,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -9157,7 +9153,7 @@ dependencies = [ [[package]] name = "sp-core" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "base58", "blake2-rfc", @@ -9201,7 +9197,7 @@ dependencies = [ [[package]] name = "sp-database" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -9210,7 +9206,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "proc-macro2", "quote", @@ -9220,7 +9216,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "environmental", "parity-scale-codec", @@ -9231,7 +9227,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "finality-grandpa", "log", @@ -9248,11 +9244,13 @@ dependencies = [ [[package]] name = "sp-inherents" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ + "async-trait", + "impl-trait-for-tuples", "parity-scale-codec", - "parking_lot 0.11.1", "sp-core", + "sp-runtime", "sp-std", "thiserror", ] @@ -9260,7 +9258,7 @@ dependencies = [ [[package]] name = "sp-io" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "futures 0.3.14", "hash-db", @@ -9284,7 +9282,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "lazy_static", "sp-core", @@ -9295,7 +9293,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "async-trait", "derive_more", @@ -9312,7 +9310,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "ruzstd", "zstd", @@ -9321,7 +9319,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "parity-scale-codec", "serde", @@ -9334,7 +9332,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -9345,7 +9343,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "sp-api", "sp-core", @@ -9355,7 +9353,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "backtrace", ] @@ -9363,7 +9361,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "serde", "sp-core", @@ -9372,7 +9370,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "either", "hash256-std-hasher", @@ -9393,7 +9391,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9410,7 +9408,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", @@ -9422,7 +9420,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "serde", "serde_json", @@ -9431,7 +9429,7 @@ dependencies = [ [[package]] name = "sp-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "parity-scale-codec", "sp-api", @@ -9444,7 +9442,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -9454,7 +9452,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "hash-db", "log", @@ -9476,12 +9474,12 @@ dependencies = [ [[package]] name = "sp-std" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" [[package]] name = "sp-storage" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9494,7 +9492,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "log", "sp-core", @@ -9507,20 +9505,24 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ + "async-trait", + "futures-timer 3.0.2", + "log", "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", "sp-std", + "thiserror", "wasm-timer", ] [[package]] name = "sp-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "log", "parity-scale-codec", @@ -9533,7 +9535,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "derive_more", "futures 0.3.14", @@ -9549,7 +9551,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "hash-db", "memory-db", @@ -9563,7 +9565,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "futures 0.3.14", "futures-core", @@ -9575,7 +9577,7 @@ dependencies = [ [[package]] name = "sp-version" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9587,7 +9589,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9744,7 +9746,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "chrono", "console_error_panic_hook", @@ -9770,7 +9772,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "platforms", ] @@ -9778,7 +9780,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.14", @@ -9801,7 +9803,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "async-std", "derive_more", @@ -9815,7 +9817,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "async-trait", "futures 0.1.29", @@ -9844,7 +9846,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "futures 0.3.14", "substrate-test-utils-derive", @@ -9854,7 +9856,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "proc-macro-crate 1.0.0", "quote", @@ -10596,7 +10598,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] name = "try-runtime-cli" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#92c15dd1e9b1f8e3c7e8d936c9b6fb15a46c2941" +source = "git+https://github.com/paritytech/substrate#ec180313e410915ed5e319358628260f9d1f3b53" dependencies = [ "frame-try-runtime", "log",