From 841c59f3398136c27cc235a29d7d459e8a4c8ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Thu, 16 Jul 2020 12:00:04 +0200 Subject: [PATCH 01/13] Change branch. --- availability-store/Cargo.toml | 16 +-- cli/Cargo.toml | 22 ++-- collator/Cargo.toml | 22 ++-- core-primitives/Cargo.toml | 6 +- erasure-coding/Cargo.toml | 4 +- network/Cargo.toml | 16 +-- network/test/Cargo.toml | 20 ++-- node/core/backing/Cargo.toml | 12 +- node/core/proposer/Cargo.toml | 22 ++-- node/network/bridge/Cargo.toml | 4 +- node/network/pov-distribution/Cargo.toml | 4 +- .../network/statement-distribution/Cargo.toml | 6 +- node/overseer/Cargo.toml | 2 +- node/primitives/Cargo.toml | 2 +- node/service/Cargo.toml | 74 ++++++------ node/subsystem/Cargo.toml | 6 +- node/test-service/Cargo.toml | 54 ++++----- parachain/Cargo.toml | 12 +- parachain/test-parachains/adder/Cargo.toml | 4 +- .../test-parachains/adder/collator/Cargo.toml | 4 +- .../test-parachains/code-upgrader/Cargo.toml | 4 +- primitives/Cargo.toml | 22 ++-- rpc/Cargo.toml | 34 +++--- runtime/common/Cargo.toml | 52 ++++----- runtime/kusama/Cargo.toml | 108 ++++++++--------- runtime/parachains/Cargo.toml | 50 ++++---- runtime/polkadot/Cargo.toml | 106 ++++++++--------- runtime/test-runtime/Cargo.toml | 76 ++++++------ runtime/test-runtime/client/Cargo.toml | 22 ++-- runtime/westend/Cargo.toml | 110 +++++++++--------- service/Cargo.toml | 74 ++++++------ statement-table/Cargo.toml | 2 +- validation/Cargo.toml | 36 +++--- 33 files changed, 504 insertions(+), 504 deletions(-) diff --git a/availability-store/Cargo.toml b/availability-store/Cargo.toml index 93dd003d3267..5dd52cbd6614 100644 --- a/availability-store/Cargo.toml +++ b/availability-store/Cargo.toml @@ -15,14 +15,14 @@ futures = "0.3.4" tokio = { version = "0.2.13", features = ["rt-core"] } exit-future = "0.2.0" codec = { package = "parity-scale-codec", version = "1.3.0", features = ["derive"] } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } -client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -keystore = { package = "sc-keystore", 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 = "td-weight-parameters-refactor" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } kvdb = "0.7.0" kvdb-memorydb = "0.7.0" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 8c8e51efc7d3..b0942cdcc524 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -17,26 +17,26 @@ crate-type = ["cdylib", "rlib"] log = "0.4.8" futures = { version = "0.3.4", features = ["compat"] } structopt = "0.3.8" -sp-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" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } service = { package = "polkadot-service", path = "../service", default-features = false, optional = true } service-new = { package = "polkadot-service-new", path = "../node/service", default-features = false, optional = true } tokio = { version = "0.2.13", features = ["rt-threaded"], optional = true } -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 } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", optional = true } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", optional = true } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", optional = true } wasm-bindgen = { version = "0.2.57", optional = true } wasm-bindgen-futures = { version = "0.4.7", optional = true } -browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", branch = "master", optional = true } +browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", optional = true } [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 = "td-weight-parameters-refactor" } [features] default = [ "wasmtime", "db", "cli", "service-old" ] diff --git a/collator/Cargo.toml b/collator/Cargo.toml index 1c9615e2a093..896b18961111 100644 --- a/collator/Cargo.toml +++ b/collator/Cargo.toml @@ -7,16 +7,16 @@ edition = "2018" [dependencies] futures = "0.3.4" -sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-executor = { 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-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-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" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } polkadot-primitives = { path = "../primitives" } polkadot-cli = { path = "../cli" } polkadot-network = { path = "../network" } @@ -29,7 +29,7 @@ futures-timer = "2.0" codec = { package = "parity-scale-codec", version = "1.3.0" } [dev-dependencies] -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } [features] default = ["service-old"] diff --git a/core-primitives/Cargo.toml b/core-primitives/Cargo.toml index b0f5971e2a59..696764445408 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", branch = "td-weight-parameters-refactor", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = [ "derive" ] } [features] diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml index 04334f0eab70..1dc0bb6cd10c 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"} codec = { package = "parity-scale-codec", version = "1.3.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 = "td-weight-parameters-refactor" } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } derive_more = "0.15.0" diff --git a/network/Cargo.toml b/network/Cargo.toml index 6b8670479651..585becf791d2 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -15,19 +15,19 @@ polkadot-validation = { path = "../validation" } polkadot-primitives = { path = "../primitives" } polkadot-erasure-coding = { path = "../erasure-coding" } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-network-gossip = { 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" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } futures = "0.3.5" log = "0.4.8" exit-future = "0.2.0" futures-timer = "2.0" -sp-blockchain = { 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 = "td-weight-parameters-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } wasm-timer = "0.2.4" rand = "0.7.3" [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } diff --git a/network/test/Cargo.toml b/network/test/Cargo.toml index f73b62c51154..6925500ac308 100644 --- a/network/test/Cargo.toml +++ b/network/test/Cargo.toml @@ -10,14 +10,14 @@ log = "0.4.8" parking_lot = "0.10.0" futures = "0.3.1" rand = "0.7.2" -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-service = { git = "https://github.com/paritytech/substrate", features = ["test-helpers"], branch = "master" } -sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-api = { 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-core = { 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 = "td-weight-parameters-refactor" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-service = { git = "https://github.com/paritytech/substrate", features = ["test-helpers"], branch = "td-weight-parameters-refactor" } +sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } polkadot-test-runtime-client = { path = "../../runtime/test-runtime/client" } diff --git a/node/core/backing/Cargo.toml b/node/core/backing/Cargo.toml index 720b8af418d2..36c707bb57ce 100644 --- a/node/core/backing/Cargo.toml +++ b/node/core/backing/Cargo.toml @@ -6,11 +6,11 @@ edition = "2018" [dependencies] futures = "0.3.5" -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "master" } -primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } polkadot-primitives = { path = "../../../primitives" } polkadot-node-primitives = { path = "../../primitives" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } @@ -20,7 +20,7 @@ derive_more = "0.99.9" bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } futures = { version = "0.3.5", features = ["thread-pool"] } subsystem-test = { package = "polkadot-subsystem-test-helpers", path = "../../test-helpers/subsystem" } assert_matches = "1.3.0" diff --git a/node/core/proposer/Cargo.toml b/node/core/proposer/Cargo.toml index 3723b80bfea4..3308e3c96b0a 100644 --- a/node/core/proposer/Cargo.toml +++ b/node/core/proposer/Cargo.toml @@ -12,16 +12,16 @@ parity-scale-codec = "1.3.0" 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" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } tokio-executor = { version = "0.2.0-alpha.6", features = ["blocking"] } wasm-timer = "0.2.4" diff --git a/node/network/bridge/Cargo.toml b/node/network/bridge/Cargo.toml index 4f6c8631e2f9..cddbe54d13a0 100644 --- a/node/network/bridge/Cargo.toml +++ b/node/network/bridge/Cargo.toml @@ -12,8 +12,8 @@ streamunordered = "0.5.1" polkadot-primitives = { path = "../../../primitives" } node-primitives = { package = "polkadot-node-primitives", path = "../../primitives" } parity-scale-codec = "1.3.0" -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } [dev-dependencies] diff --git a/node/network/pov-distribution/Cargo.toml b/node/network/pov-distribution/Cargo.toml index a99e5e3d5604..ce7bc0e88eb4 100644 --- a/node/network/pov-distribution/Cargo.toml +++ b/node/network/pov-distribution/Cargo.toml @@ -12,8 +12,8 @@ streamunordered = "0.5.1" polkadot-primitives = { path = "../../../primitives" } node-primitives = { package = "polkadot-node-primitives", path = "../../primitives" } parity-scale-codec = "1.3.0" -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } [dev-dependencies] diff --git a/node/network/statement-distribution/Cargo.toml b/node/network/statement-distribution/Cargo.toml index 2f8da8ee3d85..055f7e86c493 100644 --- a/node/network/statement-distribution/Cargo.toml +++ b/node/network/statement-distribution/Cargo.toml @@ -13,8 +13,8 @@ streamunordered = "0.5.1" polkadot-primitives = { path = "../../../primitives" } node-primitives = { package = "polkadot-node-primitives", path = "../../primitives" } parity-scale-codec = "1.3.0" -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } arrayvec = "0.5.1" indexmap = "1.4.0" @@ -23,4 +23,4 @@ indexmap = "1.4.0" parking_lot = "0.10.0" subsystem-test = { package = "polkadot-subsystem-test-helpers", path = "../../test-helpers/subsystem" } assert_matches = "1.3.0" -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } diff --git a/node/overseer/Cargo.toml b/node/overseer/Cargo.toml index 6c6ce304e6d4..cd3bc4b5c8d6 100644 --- a/node/overseer/Cargo.toml +++ b/node/overseer/Cargo.toml @@ -10,7 +10,7 @@ log = "0.4.8" futures-timer = "3.0.2" streamunordered = "0.5.1" polkadot-primitives = { path = "../../primitives" } -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 = "td-weight-parameters-refactor" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../subsystem" } async-trait = "0.1" diff --git a/node/primitives/Cargo.toml b/node/primitives/Cargo.toml index b2bc9231ae74..bdb1fc7fdad3 100644 --- a/node/primitives/Cargo.toml +++ b/node/primitives/Cargo.toml @@ -9,5 +9,5 @@ description = "Primitives types for the Node-side" polkadot-primitives = { path = "../../primitives" } polkadot-statement-table = { path = "../../statement-table" } parity-scale-codec = { version = "1.3.0", default-features = false, features = ["derive"] } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } async-trait = "0.1" diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index a9552b56ad2b..e08f3aaa55c3 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -21,47 +21,47 @@ westend-runtime = { path = "../../runtime/westend" } polkadot-network = { path = "../../network", optional = true } polkadot-rpc = { path = "../../rpc" } polkadot-node-core-proposer = { path = "../core/proposer" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { 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" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } -consensus_common = { package = "sp-consensus", 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" } -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-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master" } -authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" } -authority-discovery-primitives = { package = "sp-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" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } codec = { package = "parity-scale-codec", version = "1.3.0" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-offchain = { package = "sp-offchain", 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 = "master" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } [dev-dependencies] polkadot-test-runtime-client = { path = "../../runtime/test-runtime/client" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } env_logger = "0.7.0" [features] diff --git a/node/subsystem/Cargo.toml b/node/subsystem/Cargo.toml index 188e7cbfa764..f382400607b6 100644 --- a/node/subsystem/Cargo.toml +++ b/node/subsystem/Cargo.toml @@ -10,13 +10,13 @@ async-trait = "0.1" derive_more = "0.99.9" futures = "0.3.5" futures-timer = "3.0.2" -keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "master" } +keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } log = "0.4.8" parity-scale-codec = "1.3.0" pin-project = "0.4.22" polkadot-node-primitives = { path = "../primitives" } polkadot-primitives = { path = "../../primitives" } polkadot-statement-table = { path = "../../statement-table" } -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 = "td-weight-parameters-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } streamunordered = "0.5.1" diff --git a/node/test-service/Cargo.toml b/node/test-service/Cargo.toml index db6328a9aac2..48cab020183e 100644 --- a/node/test-service/Cargo.toml +++ b/node/test-service/Cargo.toml @@ -23,34 +23,34 @@ polkadot-service = { path = "../../service" } polkadot-test-runtime = { path = "../../runtime/test-runtime" } # Substrate dependencies -authority-discovery = { package = "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-transaction-payment = { 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-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-informant = { git = "https://github.com/paritytech/substrate", branch = "master" } -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 } -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" } +authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-informant = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } [dev-dependencies] -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } serde_json = "1.0" tokio = { version = "0.2", features = ["macros"] } diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml index 0ccb033042ed..c0e46b949156 100644 --- a/parachain/Cargo.toml +++ b/parachain/Cargo.toml @@ -10,17 +10,17 @@ edition = "2018" # this crate for WASM. This is critical to avoid forcing all parachain WASM into implementing # various unnecessary Substrate-specific endpoints. codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = [ "derive" ] } -sp-std = { package = "sp-std", 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 = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } polkadot-core-primitives = { path = "../core-primitives", default-features = false } # all optional crates. derive_more = { version = "0.99.2", optional = true } serde = { version = "1.0.102", 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", branch = "td-weight-parameters-refactor", optional = true } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", optional = true } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", optional = true } parking_lot = { version = "0.10.0", optional = true } log = { version = "0.4.8", optional = true } diff --git a/parachain/test-parachains/adder/Cargo.toml b/parachain/test-parachains/adder/Cargo.toml index 4cd2f9c8399b..af6c379fdceb 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" ] } codec = { package = "parity-scale-codec", version = "1.3.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", branch = "td-weight-parameters-refactor", default-features = false } tiny-keccak = "1.5.0" dlmalloc = { version = "0.1.3", features = [ "global" ] } # We need to make sure the global allocator is disabled until we have support of full substrate externalities -runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = [ "disable_allocator" ] } +runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, features = [ "disable_allocator" ] } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.6" } diff --git a/parachain/test-parachains/adder/collator/Cargo.toml b/parachain/test-parachains/adder/collator/Cargo.toml index 3363a908a943..4104d8b955f6 100644 --- a/parachain/test-parachains/adder/collator/Cargo.toml +++ b/parachain/test-parachains/adder/collator/Cargo.toml @@ -9,8 +9,8 @@ adder = { package = "test-parachain-adder", path = ".." } parachain = { package = "polkadot-parachain", path = "../../.." } collator = { package = "polkadot-collator", path = "../../../../collator" } primitives = { package = "polkadot-primitives", path = "../../../../primitives" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } parking_lot = "0.10.0" codec = { package = "parity-scale-codec", version = "1.2.0" } futures = "0.3.4" diff --git a/parachain/test-parachains/code-upgrader/Cargo.toml b/parachain/test-parachains/code-upgrader/Cargo.toml index 6f673adbf82a..3c703197b7d0 100644 --- a/parachain/test-parachains/code-upgrader/Cargo.toml +++ b/parachain/test-parachains/code-upgrader/Cargo.toml @@ -9,12 +9,12 @@ build = "build.rs" [dependencies] parachain = { package = "polkadot-parachain", path = "../../", default-features = false, features = [ "wasm-api" ] } codec = { package = "parity-scale-codec", version = "1.1.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", branch = "td-weight-parameters-refactor", default-features = false } tiny-keccak = "1.5.0" dlmalloc = { version = "0.1.3", features = [ "global" ] } # We need to make sure the global allocator is disabled until we have support of full substrate externalities -runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = [ "disable_allocator" ] } +runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, features = [ "disable_allocator" ] } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.6" } diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index b2f1373b05ae..216cb87bae9c 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -7,22 +7,22 @@ edition = "2018" [dependencies] serde = { version = "1.0.102", optional = true, features = ["derive"] } parity-scale-codec = { version = "1.3.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-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-staking = { 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", branch = "td-weight-parameters-refactor", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } 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", branch = "td-weight-parameters-refactor", default-features = false } bitvec = { version = "0.17.4", 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", branch = "td-weight-parameters-refactor", default-features = false } [dev-dependencies] -sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } pretty_assertions = "0.5.1" [features] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 7fea6323d8e7..1657b64cccd5 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -7,21 +7,21 @@ edition = "2018" [dependencies] jsonrpc-core = "14.0.3" 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-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-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"} -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 = "td-weight-parameters-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor"} +sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor"} +sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor"} +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor"} +txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } codec = { package = "parity-scale-codec", version = "1.3.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 = "td-weight-parameters-refactor" } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 1757636854f8..3815d48a328d 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -13,39 +13,39 @@ serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", 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", branch = "td-weight-parameters-refactor", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -session = { package = "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 } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", 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 } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } libsecp256k1 = { version = "0.3.2", default-features = false, optional = true } [dev-dependencies] hex-literal = "0.2.1" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } trie-db = "0.22.0" serde_json = "1.0.41" libsecp256k1 = "0.3.2" diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index aa33f22a403e..057ff6be6421 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -15,60 +15,60 @@ serde_derive = { version = "1.0.102", optional = true } static_assertions = "1.1.0" smallvec = "1.4.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 } -version = { package = "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", branch = "td-weight-parameters-refactor", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -society = { package = "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 } -staking = { package = "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" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -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", branch = "td-weight-parameters-refactor", default-features = false, optional = true } +pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } +pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } hex-literal = { version = "0.2.1", optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } @@ -78,8 +78,8 @@ primitives = { package = "polkadot-primitives", path = "../../primitives", defau hex-literal = "0.2.1" libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" -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 = "td-weight-parameters-refactor" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } serde_json = "1.0.41" [build-dependencies] diff --git a/runtime/parachains/Cargo.toml b/runtime/parachains/Cargo.toml index ab4ca5a78309..3507e29ade0e 100644 --- a/runtime/parachains/Cargo.toml +++ b/runtime/parachains/Cargo.toml @@ -12,25 +12,25 @@ rustc-hex = { version = "2.0.1", default-features = false } serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } -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", branch = "td-weight-parameters-refactor", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -session = { package = "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 } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offences = { package = "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 } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } libsecp256k1 = { version = "0.3.2", default-features = false, optional = true } @@ -40,13 +40,13 @@ rand_chacha = { version = "0.2.2", default-features = false } [dev-dependencies] hex-literal = "0.2.1" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } serde_json = "1.0.41" libsecp256k1 = "0.3.2" diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml index 2c8373cb8314..3f9c367241ff 100644 --- a/runtime/polkadot/Cargo.toml +++ b/runtime/polkadot/Cargo.toml @@ -15,59 +15,59 @@ serde_derive = { version = "1.0.102", optional = true } static_assertions = "1.1.0" smallvec = "1.4.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 } -version = { package = "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", branch = "td-weight-parameters-refactor", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -session = { package = "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 } -staking = { package = "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" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -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", branch = "td-weight-parameters-refactor", default-features = false, optional = true } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } +pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } +pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } hex-literal = { version = "0.2.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.2.1" libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" -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 = "td-weight-parameters-refactor" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } trie-db = "0.22.0" serde_json = "1.0.41" diff --git a/runtime/test-runtime/Cargo.toml b/runtime/test-runtime/Cargo.toml index 275c393e346c..0a46ad1cbf80 100644 --- a/runtime/test-runtime/Cargo.toml +++ b/runtime/test-runtime/Cargo.toml @@ -14,43 +14,43 @@ serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } smallvec = "1.4.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 } -rstd = { 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 } -version = { package = "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", branch = "td-weight-parameters-refactor", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment = { package = "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 } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -session = { package = "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 } -staking = { package = "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" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } 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-parachain = { path = "../../parachain", default-features = false } hex-literal = "0.2.1" libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" -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 = "td-weight-parameters-refactor" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } serde_json = "1.0.41" [build-dependencies] diff --git a/runtime/test-runtime/client/Cargo.toml b/runtime/test-runtime/client/Cargo.toml index 7dbb7d5ec5a0..96cbb77439bb 100644 --- a/runtime/test-runtime/client/Cargo.toml +++ b/runtime/test-runtime/client/Cargo.toml @@ -16,14 +16,14 @@ polkadot-test-runtime = { path = ".." } polkadot-test-service = { path = "../../../node/test-service" } # Substrate dependencies -pallet-timestamp = { 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-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-light = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["test-helpers"], default-features = false } -sp-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" } -substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-light = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", features = ["test-helpers"], default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } diff --git a/runtime/westend/Cargo.toml b/runtime/westend/Cargo.toml index 1636786320d1..cd62851be759 100644 --- a/runtime/westend/Cargo.toml +++ b/runtime/westend/Cargo.toml @@ -15,61 +15,61 @@ serde_derive = { version = "1.0.102", optional = true } smallvec = "1.4.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 } -version = { package = "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", branch = "td-weight-parameters-refactor", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -society = { package = "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 } -staking = { package = "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" } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -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", branch = "td-weight-parameters-refactor", default-features = false, optional = true } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } +pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } +pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } hex-literal = { version = "0.2.1", optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } @@ -80,8 +80,8 @@ polkadot-parachain = { path = "../../parachain", default-features = false } hex-literal = "0.2.1" libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" -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 = "td-weight-parameters-refactor" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } serde_json = "1.0.41" [build-dependencies] diff --git a/service/Cargo.toml b/service/Cargo.toml index 5514339f9ba1..9aac21876c1f 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -20,47 +20,47 @@ kusama-runtime = { path = "../runtime/kusama" } westend-runtime = { path = "../runtime/westend" } polkadot-network = { path = "../network", optional = true } polkadot-rpc = { path = "../rpc" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { 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" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } -consensus_common = { package = "sp-consensus", 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" } -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-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master" } -authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" } -authority-discovery-primitives = { package = "sp-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" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } codec = { package = "parity-scale-codec", version = "1.3.0" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-offchain = { package = "sp-offchain", 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 = "master" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } [dev-dependencies] polkadot-test-runtime-client = { path = "../runtime/test-runtime/client" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } env_logger = "0.7.0" [features] diff --git a/statement-table/Cargo.toml b/statement-table/Cargo.toml index 030b23f0b7ec..7bfe24d27056 100644 --- a/statement-table/Cargo.toml +++ b/statement-table/Cargo.toml @@ -6,5 +6,5 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.3.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 = "td-weight-parameters-refactor" } primitives = { package = "polkadot-primitives", path = "../primitives" } diff --git a/validation/Cargo.toml b/validation/Cargo.toml index d3cee5c0479b..8fa67b197765 100644 --- a/validation/Cargo.toml +++ b/validation/Cargo.toml @@ -19,24 +19,24 @@ parachain = { package = "polkadot-parachain", path = "../parachain" } polkadot-primitives = { path = "../primitives" } polkadot-erasure-coding = { path = "../erasure-coding" } table = { package = "polkadot-statement-table", path = "../statement-table" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master" } -consensus = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } -primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" } -txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" } -block-builder = { package = "sc-block-builder", git = "https://github.com/paritytech/substrate", branch = "master" } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +consensus = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +block-builder = { package = "sc-block-builder", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } -runtime_babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } -keystore = { package = "sc-keystore", 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 = "master" } +runtime_babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } From 03d1983da24eca175042345744dcc14d853816e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Thu, 16 Jul 2020 12:45:45 +0200 Subject: [PATCH 02/13] Update runtime. --- runtime/common/src/lib.rs | 56 ++++++++++++++++++++++--------------- runtime/kusama/src/lib.rs | 23 ++++++++------- runtime/polkadot/src/lib.rs | 23 ++++++++------- runtime/westend/src/lib.rs | 20 ++++++------- 4 files changed, 66 insertions(+), 56 deletions(-) diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index d32db38e05be..b6d9e0480979 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -28,10 +28,11 @@ pub mod crowdfund; pub mod impls; use primitives::v0::BlockNumber; -use sp_runtime::{Perquintill, Perbill, FixedPointNumber, traits::Saturating}; +use sp_runtime::{Perquintill, Perbill, FixedPointNumber}; +use system::weights; use frame_support::{ parameter_types, traits::{Currency}, - weights::{Weight, constants::WEIGHT_PER_SECOND}, + weights::{Weight, constants::WEIGHT_PER_SECOND, DispatchClass}, }; use transaction_payment::{TargetedFeeAdjustment, Multiplier}; use static_assertions::const_assert; @@ -53,19 +54,16 @@ pub type NegativeImbalance = as Currency<= AVERAGE_ON_INITIALIZE_WEIGHT.deconstruct()); +const_assert!(NORMAL_DISPATCH_RATIO.deconstruct() >= AVERAGE_ON_INITIALIZE_RATIO.deconstruct()); /// Parameterized slow adjusting fee updated based on /// https://w3f-research.readthedocs.io/en/latest/polkadot/Token%20Economics.html#-2.-slow-adjusting-mechanism @@ -110,14 +125,18 @@ mod multiplier_tests { parameter_types! { pub const BlockHashCount: u64 = 250; - pub const ExtrinsicBaseWeight: u64 = 100; - pub const MaximumBlockWeight: Weight = 1024; - pub const MaximumBlockLength: u32 = 2 * 1024; pub const AvailableBlockRatio: Perbill = Perbill::one(); + pub BlockLength: system::weights::BlockLength = + system::weights::BlockLength::max(2 * 1024); + pub BlockWeights: system::weights::BlockWeights = + system::weights::BlockWeights::simple_max(1024); } impl system::Trait for Runtime { type BaseCallFilter = (); + type BlockWeights = BlockWeights; + type BlockLength = (); + type DbWeight = (); type Origin = Origin; type Index = u64; type BlockNumber = u64; @@ -129,13 +148,6 @@ mod multiplier_tests { type Header = Header; type Event = (); type BlockHashCount = BlockHashCount; - type MaximumBlockWeight = MaximumBlockWeight; - type DbWeight = (); - type BlockExecutionWeight = (); - type ExtrinsicBaseWeight = ExtrinsicBaseWeight; - type MaximumExtrinsicWeight = MaximumBlockWeight; - type MaximumBlockLength = MaximumBlockLength; - type AvailableBlockRatio = AvailableBlockRatio; type Version = (); type ModuleToIndex = (); type AccountData = (); diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index cba2ad10c0cf..f4114b22da7e 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -31,9 +31,7 @@ use primitives::v0::{ use runtime_common::{ attestations, claims, parachains, registrar, slots, SlowAdjustingFeeUpdate, impls::{CurrencyToVoteHandler, ToAuthor}, - NegativeImbalance, BlockHashCount, MaximumBlockWeight, AvailableBlockRatio, - MaximumBlockLength, BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, - MaximumExtrinsicWeight, + NegativeImbalance, BlockHashCount, RocksDbWeight, BlockWeights, BlockLength, }; use sp_runtime::{ create_runtime_str, generic, impl_opaque_keys, ModuleId, @@ -125,6 +123,8 @@ parameter_types! { impl system::Trait for Runtime { type BaseCallFilter = BaseFilter; + type BlockWeights = BlockWeights; + type BlockLength = BlockLength; type Origin = Origin; type Call = Call; type Index = Nonce; @@ -136,13 +136,7 @@ impl system::Trait for Runtime { type Header = generic::Header; type Event = Event; type BlockHashCount = BlockHashCount; - type MaximumBlockWeight = MaximumBlockWeight; type DbWeight = RocksDbWeight; - type BlockExecutionWeight = BlockExecutionWeight; - type ExtrinsicBaseWeight = ExtrinsicBaseWeight; - type MaximumExtrinsicWeight = MaximumExtrinsicWeight; - type MaximumBlockLength = MaximumBlockLength; - type AvailableBlockRatio = AvailableBlockRatio; type Version = Version; type ModuleToIndex = ModuleToIndex; type AccountData = balances::AccountData; @@ -151,12 +145,17 @@ impl system::Trait for Runtime { type SystemWeightInfo = (); } +parameter_types! { + pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * + BlockWeights::get().max_block; +} + impl scheduler::Trait for Runtime { type Event = Event; type Origin = Origin; type PalletsOrigin = OriginCaller; type Call = Call; - type MaximumWeight = MaximumBlockWeight; + type MaximumWeight = MaximumSchedulerWeight; type ScheduleOrigin = EnsureRoot; type WeightInfo = (); } @@ -514,7 +513,7 @@ impl treasury::Trait for Runtime { } parameter_types! { - pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get(); + pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * BlockWeights::get().max_block; } impl offences::Trait for Runtime { @@ -930,7 +929,7 @@ pub struct CustomOnRuntimeUpgrade; impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade { fn on_runtime_upgrade() -> frame_support::weights::Weight { if scheduler::Module::::migrate_v1_to_t2() { - ::MaximumBlockWeight::get() + ::BlockWeights::get().max_block } else { ::DbWeight::get().reads(1) + 500_000_000 } diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 8c11e960e423..cd91fe1e270d 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -23,9 +23,7 @@ use runtime_common::{ attestations, claims, parachains, registrar, slots, SlowAdjustingFeeUpdate, impls::{CurrencyToVoteHandler, ToAuthor}, - NegativeImbalance, BlockHashCount, MaximumBlockWeight, AvailableBlockRatio, - MaximumBlockLength, BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, - MaximumExtrinsicWeight, + NegativeImbalance, BlockHashCount, BlockWeights, BlockLength, RocksDbWeight, }; use sp_std::prelude::*; @@ -152,6 +150,8 @@ parameter_types! { impl system::Trait for Runtime { type BaseCallFilter = BaseFilter; + type BlockWeights = BlockWeights; + type BlockLength = BlockLength; type Origin = Origin; type Call = Call; type Index = Nonce; @@ -163,13 +163,7 @@ impl system::Trait for Runtime { type Header = generic::Header; type Event = Event; type BlockHashCount = BlockHashCount; - type MaximumBlockWeight = MaximumBlockWeight; type DbWeight = RocksDbWeight; - type BlockExecutionWeight = BlockExecutionWeight; - type ExtrinsicBaseWeight = ExtrinsicBaseWeight; - type MaximumExtrinsicWeight = MaximumExtrinsicWeight; - type MaximumBlockLength = MaximumBlockLength; - type AvailableBlockRatio = AvailableBlockRatio; type Version = Version; type ModuleToIndex = ModuleToIndex; type AccountData = balances::AccountData; @@ -178,12 +172,17 @@ impl system::Trait for Runtime { type SystemWeightInfo = (); } +parameter_types! { + pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * + BlockWeights::get().max_block; +} + impl scheduler::Trait for Runtime { type Event = Event; type Origin = Origin; type PalletsOrigin = OriginCaller; type Call = Call; - type MaximumWeight = MaximumBlockWeight; + type MaximumWeight = MaximumSchedulerWeight; type ScheduleOrigin = EnsureRoot; type WeightInfo = (); } @@ -579,7 +578,7 @@ impl treasury::Trait for Runtime { } parameter_types! { - pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get(); + pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * BlockWeights::get().max_block; } impl offences::Trait for Runtime { @@ -931,7 +930,7 @@ pub struct CustomOnRuntimeUpgrade; impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade { fn on_runtime_upgrade() -> frame_support::weights::Weight { if scheduler::Module::::migrate_v1_to_t2() { - ::MaximumBlockWeight::get() + ::BlockWeights::get().max_block } else { ::DbWeight::get().reads(1) } diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index a0eaa03fd62a..51a1615b63da 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -30,8 +30,7 @@ use primitives::v0::{ use runtime_common::{ attestations, parachains, registrar, SlowAdjustingFeeUpdate, impls::{CurrencyToVoteHandler, ToAuthor}, - BlockHashCount, MaximumBlockWeight, AvailableBlockRatio, MaximumBlockLength, - BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, MaximumExtrinsicWeight, + BlockHashCount, RocksDbWeight, BlockLength, BlockWeights, }; use sp_runtime::{ create_runtime_str, generic, impl_opaque_keys, @@ -115,6 +114,8 @@ parameter_types! { impl system::Trait for Runtime { type BaseCallFilter = BaseFilter; + type BlockWeights = BlockWeights; + type BlockLength = BlockLength; type Origin = Origin; type Call = Call; type Index = Nonce; @@ -126,13 +127,7 @@ impl system::Trait for Runtime { type Header = generic::Header; type Event = Event; type BlockHashCount = BlockHashCount; - type MaximumBlockWeight = MaximumBlockWeight; type DbWeight = RocksDbWeight; - type BlockExecutionWeight = BlockExecutionWeight; - type ExtrinsicBaseWeight = ExtrinsicBaseWeight; - type MaximumExtrinsicWeight = MaximumExtrinsicWeight; - type MaximumBlockLength = MaximumBlockLength; - type AvailableBlockRatio = AvailableBlockRatio; type Version = Version; type ModuleToIndex = ModuleToIndex; type AccountData = balances::AccountData; @@ -141,12 +136,17 @@ impl system::Trait for Runtime { type SystemWeightInfo = (); } +parameter_types! { + pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * + BlockWeights::get().max_block; +} + impl scheduler::Trait for Runtime { type Event = Event; type Origin = Origin; type PalletsOrigin = OriginCaller; type Call = Call; - type MaximumWeight = MaximumBlockWeight; + type MaximumWeight = MaximumSchedulerWeight; type ScheduleOrigin = EnsureRoot; type WeightInfo = (); } @@ -339,7 +339,7 @@ parameter_types! { } parameter_types! { - pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get(); + pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * BlockWeights::get().max_block; } impl offences::Trait for Runtime { From 31ee0509b11a56beb63442e4fe99ab2779bfafed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Thu, 16 Jul 2020 12:49:29 +0200 Subject: [PATCH 03/13] Revert "Change branch." This reverts commit 841c59f3398136c27cc235a29d7d459e8a4c8ce0. --- availability-store/Cargo.toml | 16 +-- cli/Cargo.toml | 22 ++-- collator/Cargo.toml | 22 ++-- core-primitives/Cargo.toml | 6 +- erasure-coding/Cargo.toml | 4 +- network/Cargo.toml | 16 +-- network/test/Cargo.toml | 20 ++-- node/core/backing/Cargo.toml | 12 +- node/core/proposer/Cargo.toml | 22 ++-- node/network/bridge/Cargo.toml | 4 +- node/network/pov-distribution/Cargo.toml | 4 +- .../network/statement-distribution/Cargo.toml | 6 +- node/overseer/Cargo.toml | 2 +- node/primitives/Cargo.toml | 2 +- node/service/Cargo.toml | 74 ++++++------ node/subsystem/Cargo.toml | 6 +- node/test-service/Cargo.toml | 54 ++++----- parachain/Cargo.toml | 12 +- parachain/test-parachains/adder/Cargo.toml | 4 +- .../test-parachains/adder/collator/Cargo.toml | 4 +- .../test-parachains/code-upgrader/Cargo.toml | 4 +- primitives/Cargo.toml | 22 ++-- rpc/Cargo.toml | 34 +++--- runtime/common/Cargo.toml | 52 ++++----- runtime/kusama/Cargo.toml | 108 ++++++++--------- runtime/parachains/Cargo.toml | 50 ++++---- runtime/polkadot/Cargo.toml | 106 ++++++++--------- runtime/test-runtime/Cargo.toml | 76 ++++++------ runtime/test-runtime/client/Cargo.toml | 22 ++-- runtime/westend/Cargo.toml | 110 +++++++++--------- service/Cargo.toml | 74 ++++++------ statement-table/Cargo.toml | 2 +- validation/Cargo.toml | 36 +++--- 33 files changed, 504 insertions(+), 504 deletions(-) diff --git a/availability-store/Cargo.toml b/availability-store/Cargo.toml index 5dd52cbd6614..93dd003d3267 100644 --- a/availability-store/Cargo.toml +++ b/availability-store/Cargo.toml @@ -15,14 +15,14 @@ futures = "0.3.4" tokio = { version = "0.2.13", features = ["rt-core"] } exit-future = "0.2.0" codec = { package = "parity-scale-codec", version = "1.3.0", features = ["derive"] } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } +client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } kvdb = "0.7.0" kvdb-memorydb = "0.7.0" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index b0942cdcc524..8c8e51efc7d3 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -17,26 +17,26 @@ crate-type = ["cdylib", "rlib"] log = "0.4.8" futures = { version = "0.3.4", features = ["compat"] } structopt = "0.3.8" -sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-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" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } service = { package = "polkadot-service", path = "../service", default-features = false, optional = true } service-new = { package = "polkadot-service-new", path = "../node/service", default-features = false, optional = true } tokio = { version = "0.2.13", features = ["rt-threaded"], optional = true } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", optional = true } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", optional = true } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", optional = true } +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 } wasm-bindgen = { version = "0.2.57", optional = true } wasm-bindgen-futures = { version = "0.4.7", optional = true } -browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", optional = true } +browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", branch = "master", optional = true } [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } [features] default = [ "wasmtime", "db", "cli", "service-old" ] diff --git a/collator/Cargo.toml b/collator/Cargo.toml index 896b18961111..1c9615e2a093 100644 --- a/collator/Cargo.toml +++ b/collator/Cargo.toml @@ -7,16 +7,16 @@ edition = "2018" [dependencies] futures = "0.3.4" -sc-service = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-executor = { 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-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-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" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } polkadot-primitives = { path = "../primitives" } polkadot-cli = { path = "../cli" } polkadot-network = { path = "../network" } @@ -29,7 +29,7 @@ futures-timer = "2.0" codec = { package = "parity-scale-codec", version = "1.3.0" } [dev-dependencies] -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } [features] default = ["service-old"] diff --git a/core-primitives/Cargo.toml b/core-primitives/Cargo.toml index 696764445408..b0f5971e2a59 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 = "td-weight-parameters-refactor", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", 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 } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = [ "derive" ] } [features] diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml index 1dc0bb6cd10c..04334f0eab70 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"} codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" } derive_more = "0.15.0" diff --git a/network/Cargo.toml b/network/Cargo.toml index 585becf791d2..6b8670479651 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -15,19 +15,19 @@ polkadot-validation = { path = "../validation" } polkadot-primitives = { path = "../primitives" } polkadot-erasure-coding = { path = "../erasure-coding" } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network-gossip = { 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" } futures = "0.3.5" log = "0.4.8" exit-future = "0.2.0" futures-timer = "2.0" -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } wasm-timer = "0.2.4" rand = "0.7.3" [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/network/test/Cargo.toml b/network/test/Cargo.toml index 6925500ac308..f73b62c51154 100644 --- a/network/test/Cargo.toml +++ b/network/test/Cargo.toml @@ -10,14 +10,14 @@ log = "0.4.8" parking_lot = "0.10.0" futures = "0.3.1" rand = "0.7.2" -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-service = { git = "https://github.com/paritytech/substrate", features = ["test-helpers"], branch = "td-weight-parameters-refactor" } -sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-service = { git = "https://github.com/paritytech/substrate", features = ["test-helpers"], branch = "master" } +sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-api = { 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-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } polkadot-test-runtime-client = { path = "../../runtime/test-runtime/client" } diff --git a/node/core/backing/Cargo.toml b/node/core/backing/Cargo.toml index 36c707bb57ce..720b8af418d2 100644 --- a/node/core/backing/Cargo.toml +++ b/node/core/backing/Cargo.toml @@ -6,11 +6,11 @@ edition = "2018" [dependencies] futures = "0.3.5" -sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "master" } +primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" } polkadot-primitives = { path = "../../../primitives" } polkadot-node-primitives = { path = "../../primitives" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } @@ -20,7 +20,7 @@ derive_more = "0.99.9" bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } futures = { version = "0.3.5", features = ["thread-pool"] } subsystem-test = { package = "polkadot-subsystem-test-helpers", path = "../../test-helpers/subsystem" } assert_matches = "1.3.0" diff --git a/node/core/proposer/Cargo.toml b/node/core/proposer/Cargo.toml index 3308e3c96b0a..3723b80bfea4 100644 --- a/node/core/proposer/Cargo.toml +++ b/node/core/proposer/Cargo.toml @@ -12,16 +12,16 @@ parity-scale-codec = "1.3.0" polkadot-node-subsystem = { path = "../../subsystem" } polkadot-overseer = { path = "../../overseer" } polkadot-primitives = { path = "../../../primitives" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +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" } tokio-executor = { version = "0.2.0-alpha.6", features = ["blocking"] } wasm-timer = "0.2.4" diff --git a/node/network/bridge/Cargo.toml b/node/network/bridge/Cargo.toml index cddbe54d13a0..4f6c8631e2f9 100644 --- a/node/network/bridge/Cargo.toml +++ b/node/network/bridge/Cargo.toml @@ -12,8 +12,8 @@ streamunordered = "0.5.1" polkadot-primitives = { path = "../../../primitives" } node-primitives = { package = "polkadot-node-primitives", path = "../../primitives" } parity-scale-codec = "1.3.0" -sc-network = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } [dev-dependencies] diff --git a/node/network/pov-distribution/Cargo.toml b/node/network/pov-distribution/Cargo.toml index ce7bc0e88eb4..a99e5e3d5604 100644 --- a/node/network/pov-distribution/Cargo.toml +++ b/node/network/pov-distribution/Cargo.toml @@ -12,8 +12,8 @@ streamunordered = "0.5.1" polkadot-primitives = { path = "../../../primitives" } node-primitives = { package = "polkadot-node-primitives", path = "../../primitives" } parity-scale-codec = "1.3.0" -sc-network = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } [dev-dependencies] diff --git a/node/network/statement-distribution/Cargo.toml b/node/network/statement-distribution/Cargo.toml index 055f7e86c493..2f8da8ee3d85 100644 --- a/node/network/statement-distribution/Cargo.toml +++ b/node/network/statement-distribution/Cargo.toml @@ -13,8 +13,8 @@ streamunordered = "0.5.1" polkadot-primitives = { path = "../../../primitives" } node-primitives = { package = "polkadot-node-primitives", path = "../../primitives" } parity-scale-codec = "1.3.0" -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } arrayvec = "0.5.1" indexmap = "1.4.0" @@ -23,4 +23,4 @@ indexmap = "1.4.0" parking_lot = "0.10.0" subsystem-test = { package = "polkadot-subsystem-test-helpers", path = "../../test-helpers/subsystem" } assert_matches = "1.3.0" -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/node/overseer/Cargo.toml b/node/overseer/Cargo.toml index cd3bc4b5c8d6..6c6ce304e6d4 100644 --- a/node/overseer/Cargo.toml +++ b/node/overseer/Cargo.toml @@ -10,7 +10,7 @@ log = "0.4.8" futures-timer = "3.0.2" streamunordered = "0.5.1" polkadot-primitives = { path = "../../primitives" } -client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../subsystem" } async-trait = "0.1" diff --git a/node/primitives/Cargo.toml b/node/primitives/Cargo.toml index bdb1fc7fdad3..b2bc9231ae74 100644 --- a/node/primitives/Cargo.toml +++ b/node/primitives/Cargo.toml @@ -9,5 +9,5 @@ description = "Primitives types for the Node-side" polkadot-primitives = { path = "../../primitives" } polkadot-statement-table = { path = "../../statement-table" } parity-scale-codec = { version = "1.3.0", default-features = false, features = ["derive"] } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } async-trait = "0.1" diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index e08f3aaa55c3..a9552b56ad2b 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -21,47 +21,47 @@ westend-runtime = { path = "../../runtime/westend" } polkadot-network = { path = "../../network", optional = true } polkadot-rpc = { path = "../../rpc" } polkadot-node-core-proposer = { path = "../core/proposer" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { 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" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } +consensus_common = { package = "sp-consensus", 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" } +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-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master" } +authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" } +authority-discovery-primitives = { package = "sp-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" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master" } codec = { package = "parity-scale-codec", version = "1.3.0" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-offchain = { package = "sp-offchain", 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 = "master" } [dev-dependencies] polkadot-test-runtime-client = { path = "../../runtime/test-runtime/client" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } env_logger = "0.7.0" [features] diff --git a/node/subsystem/Cargo.toml b/node/subsystem/Cargo.toml index f382400607b6..188e7cbfa764 100644 --- a/node/subsystem/Cargo.toml +++ b/node/subsystem/Cargo.toml @@ -10,13 +10,13 @@ async-trait = "0.1" derive_more = "0.99.9" futures = "0.3.5" futures-timer = "3.0.2" -keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "master" } log = "0.4.8" parity-scale-codec = "1.3.0" pin-project = "0.4.22" polkadot-node-primitives = { path = "../primitives" } polkadot-primitives = { path = "../../primitives" } polkadot-statement-table = { path = "../../statement-table" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } streamunordered = "0.5.1" diff --git a/node/test-service/Cargo.toml b/node/test-service/Cargo.toml index 48cab020183e..db6328a9aac2 100644 --- a/node/test-service/Cargo.toml +++ b/node/test-service/Cargo.toml @@ -23,34 +23,34 @@ polkadot-service = { path = "../../service" } polkadot-test-runtime = { path = "../../runtime/test-runtime" } # Substrate dependencies -authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-informant = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +authority-discovery = { package = "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-transaction-payment = { 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-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-informant = { git = "https://github.com/paritytech/substrate", branch = "master" } +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 } +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" } [dev-dependencies] -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } serde_json = "1.0" tokio = { version = "0.2", features = ["macros"] } diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml index c0e46b949156..0ccb033042ed 100644 --- a/parachain/Cargo.toml +++ b/parachain/Cargo.toml @@ -10,17 +10,17 @@ edition = "2018" # this crate for WASM. This is critical to avoid forcing all parachain WASM into implementing # various unnecessary Substrate-specific endpoints. codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = [ "derive" ] } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-std = { package = "sp-std", 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 } polkadot-core-primitives = { path = "../core-primitives", default-features = false } # all optional crates. derive_more = { version = "0.99.2", optional = true } serde = { version = "1.0.102", default-features = false, features = [ "derive" ], optional = true } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", optional = true } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", optional = true } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", 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 } parking_lot = { version = "0.10.0", optional = true } log = { version = "0.4.8", optional = true } diff --git a/parachain/test-parachains/adder/Cargo.toml b/parachain/test-parachains/adder/Cargo.toml index af6c379fdceb..4cd2f9c8399b 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" ] } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } tiny-keccak = "1.5.0" dlmalloc = { version = "0.1.3", features = [ "global" ] } # We need to make sure the global allocator is disabled until we have support of full substrate externalities -runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, features = [ "disable_allocator" ] } +runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = [ "disable_allocator" ] } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.6" } diff --git a/parachain/test-parachains/adder/collator/Cargo.toml b/parachain/test-parachains/adder/collator/Cargo.toml index 4104d8b955f6..3363a908a943 100644 --- a/parachain/test-parachains/adder/collator/Cargo.toml +++ b/parachain/test-parachains/adder/collator/Cargo.toml @@ -9,8 +9,8 @@ adder = { package = "test-parachain-adder", path = ".." } parachain = { package = "polkadot-parachain", path = "../../.." } collator = { package = "polkadot-collator", path = "../../../../collator" } primitives = { package = "polkadot-primitives", path = "../../../../primitives" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" } parking_lot = "0.10.0" codec = { package = "parity-scale-codec", version = "1.2.0" } futures = "0.3.4" diff --git a/parachain/test-parachains/code-upgrader/Cargo.toml b/parachain/test-parachains/code-upgrader/Cargo.toml index 3c703197b7d0..6f673adbf82a 100644 --- a/parachain/test-parachains/code-upgrader/Cargo.toml +++ b/parachain/test-parachains/code-upgrader/Cargo.toml @@ -9,12 +9,12 @@ build = "build.rs" [dependencies] parachain = { package = "polkadot-parachain", path = "../../", default-features = false, features = [ "wasm-api" ] } codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } tiny-keccak = "1.5.0" dlmalloc = { version = "0.1.3", features = [ "global" ] } # We need to make sure the global allocator is disabled until we have support of full substrate externalities -runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, features = [ "disable_allocator" ] } +runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = [ "disable_allocator" ] } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.6" } diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 216cb87bae9c..b2f1373b05ae 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -7,22 +7,22 @@ edition = "2018" [dependencies] serde = { version = "1.0.102", optional = true, features = ["derive"] } parity-scale-codec = { version = "1.3.0", default-features = false, features = ["bit-vec", "derive"] } -primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +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-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-staking = { 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 } 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 = "td-weight-parameters-refactor", default-features = false } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [dev-dependencies] -sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "master" } pretty_assertions = "0.5.1" [features] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 1657b64cccd5..7fea6323d8e7 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -7,21 +7,21 @@ edition = "2018" [dependencies] jsonrpc-core = "14.0.3" polkadot-primitives = { path = "../primitives" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor"} -sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor"} -sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor"} -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor"} -txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-client-api = { 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-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-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"} +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" } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 3815d48a328d..1757636854f8 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -13,39 +13,39 @@ serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } static_assertions = "1.1.0" -sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", 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 } +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 } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +session = { package = "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 } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", 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 } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } libsecp256k1 = { version = "0.3.2", default-features = false, optional = true } [dev-dependencies] hex-literal = "0.2.1" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master" } trie-db = "0.22.0" serde_json = "1.0.41" libsecp256k1 = "0.3.2" diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index 057ff6be6421..aa33f22a403e 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -15,60 +15,60 @@ serde_derive = { version = "1.0.102", optional = true } static_assertions = "1.1.0" smallvec = "1.4.1" -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +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 } +version = { package = "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 = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +society = { package = "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 } +staking = { package = "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" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } -pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } -pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } +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 } hex-literal = { version = "0.2.1", optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } @@ -78,8 +78,8 @@ primitives = { package = "polkadot-primitives", path = "../../primitives", defau hex-literal = "0.2.1" libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } serde_json = "1.0.41" [build-dependencies] diff --git a/runtime/parachains/Cargo.toml b/runtime/parachains/Cargo.toml index 3507e29ade0e..ab4ca5a78309 100644 --- a/runtime/parachains/Cargo.toml +++ b/runtime/parachains/Cargo.toml @@ -12,25 +12,25 @@ rustc-hex = { version = "2.0.1", default-features = false } serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", 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 } +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 } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +session = { package = "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 } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +offences = { package = "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 } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } libsecp256k1 = { version = "0.3.2", default-features = false, optional = true } @@ -40,13 +40,13 @@ rand_chacha = { version = "0.2.2", default-features = false } [dev-dependencies] hex-literal = "0.2.1" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master" } serde_json = "1.0.41" libsecp256k1 = "0.3.2" diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml index 3f9c367241ff..2c8373cb8314 100644 --- a/runtime/polkadot/Cargo.toml +++ b/runtime/polkadot/Cargo.toml @@ -15,59 +15,59 @@ serde_derive = { version = "1.0.102", optional = true } static_assertions = "1.1.0" smallvec = "1.4.1" -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +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 } +version = { package = "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 = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +session = { package = "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 } +staking = { package = "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" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } -pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } -pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } +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 } hex-literal = { version = "0.2.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.2.1" libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } trie-db = "0.22.0" serde_json = "1.0.41" diff --git a/runtime/test-runtime/Cargo.toml b/runtime/test-runtime/Cargo.toml index 0a46ad1cbf80..275c393e346c 100644 --- a/runtime/test-runtime/Cargo.toml +++ b/runtime/test-runtime/Cargo.toml @@ -14,43 +14,43 @@ serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } smallvec = "1.4.1" -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +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 } +rstd = { 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 } +version = { package = "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 = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +transaction-payment = { package = "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 } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +session = { package = "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 } +staking = { package = "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" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } 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-parachain = { path = "../../parachain", default-features = false } hex-literal = "0.2.1" libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } serde_json = "1.0.41" [build-dependencies] diff --git a/runtime/test-runtime/client/Cargo.toml b/runtime/test-runtime/client/Cargo.toml index 96cbb77439bb..7dbb7d5ec5a0 100644 --- a/runtime/test-runtime/client/Cargo.toml +++ b/runtime/test-runtime/client/Cargo.toml @@ -16,14 +16,14 @@ polkadot-test-runtime = { path = ".." } polkadot-test-service = { path = "../../../node/test-service" } # Substrate dependencies -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-light = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", features = ["test-helpers"], default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +pallet-timestamp = { 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-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-light = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["test-helpers"], default-features = false } +sp-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" } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/runtime/westend/Cargo.toml b/runtime/westend/Cargo.toml index cd62851be759..1636786320d1 100644 --- a/runtime/westend/Cargo.toml +++ b/runtime/westend/Cargo.toml @@ -15,61 +15,61 @@ serde_derive = { version = "1.0.102", optional = true } smallvec = "1.4.1" static_assertions = "1.1.0" -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +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 } +version = { package = "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 = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +society = { package = "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 } +staking = { package = "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" } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } -pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } -pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false, optional = true } +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 } hex-literal = { version = "0.2.1", optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } @@ -80,8 +80,8 @@ polkadot-parachain = { path = "../../parachain", default-features = false } hex-literal = "0.2.1" libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } serde_json = "1.0.41" [build-dependencies] diff --git a/service/Cargo.toml b/service/Cargo.toml index 9aac21876c1f..5514339f9ba1 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -20,47 +20,47 @@ kusama-runtime = { path = "../runtime/kusama" } westend-runtime = { path = "../runtime/westend" } polkadot-network = { path = "../network", optional = true } polkadot-rpc = { path = "../rpc" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor", default-features = false } -telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { 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" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } +consensus_common = { package = "sp-consensus", 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" } +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-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master" } +authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" } +authority-discovery-primitives = { package = "sp-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" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master" } codec = { package = "parity-scale-codec", version = "1.3.0" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-offchain = { package = "sp-offchain", 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 = "master" } [dev-dependencies] polkadot-test-runtime-client = { path = "../runtime/test-runtime/client" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } env_logger = "0.7.0" [features] diff --git a/statement-table/Cargo.toml b/statement-table/Cargo.toml index 7bfe24d27056..030b23f0b7ec 100644 --- a/statement-table/Cargo.toml +++ b/statement-table/Cargo.toml @@ -6,5 +6,5 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } primitives = { package = "polkadot-primitives", path = "../primitives" } diff --git a/validation/Cargo.toml b/validation/Cargo.toml index 8fa67b197765..d3cee5c0479b 100644 --- a/validation/Cargo.toml +++ b/validation/Cargo.toml @@ -19,24 +19,24 @@ parachain = { package = "polkadot-parachain", path = "../parachain" } polkadot-primitives = { path = "../primitives" } polkadot-erasure-coding = { path = "../erasure-coding" } table = { package = "polkadot-statement-table", path = "../statement-table" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -consensus = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -block-builder = { package = "sc-block-builder", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master" } +consensus = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } +primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" } +txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" } +block-builder = { package = "sc-block-builder", git = "https://github.com/paritytech/substrate", branch = "master" } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master" } bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } -runtime_babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +runtime_babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } +keystore = { package = "sc-keystore", 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 = "master" } [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "td-weight-parameters-refactor" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } From fc38264084bf23df73b774b252a7a90832b63545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Tue, 28 Jul 2020 14:39:53 +0200 Subject: [PATCH 04/13] Update substrate. --- Cargo.lock | 285 +++++++++++++++++++------------------- runtime/common/src/lib.rs | 39 +++--- 2 files changed, 161 insertions(+), 163 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cfc4f6ed86c7..c34e36ad38b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1370,7 +1370,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "parity-scale-codec", ] @@ -1378,7 +1378,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-support", "frame-system", @@ -1395,7 +1395,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "Inflector", "frame-benchmarking", @@ -1414,7 +1414,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-support", "frame-system", @@ -1429,7 +1429,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "parity-scale-codec", "serde", @@ -1440,7 +1440,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "bitmask", "frame-metadata", @@ -1465,7 +1465,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.18", @@ -1476,7 +1476,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1488,7 +1488,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -1498,7 +1498,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1514,7 +1514,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-benchmarking", "frame-support", @@ -1528,7 +1528,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "parity-scale-codec", "sp-api", @@ -3542,7 +3542,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-support", "frame-system", @@ -3558,7 +3558,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-support", "frame-system", @@ -3573,7 +3573,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-benchmarking", "frame-support", @@ -3598,7 +3598,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-benchmarking", "frame-support", @@ -3612,7 +3612,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-benchmarking", "frame-support", @@ -3628,7 +3628,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-benchmarking", "frame-support", @@ -3643,7 +3643,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-benchmarking", "frame-support", @@ -3658,7 +3658,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-support", "frame-system", @@ -3674,7 +3674,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-benchmarking", "frame-support", @@ -3696,7 +3696,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3712,7 +3712,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-benchmarking", "frame-support", @@ -3732,7 +3732,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-support", "frame-system", @@ -3748,7 +3748,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-support", "frame-system", @@ -3762,7 +3762,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-support", "frame-system", @@ -3777,7 +3777,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-support", "frame-system", @@ -3791,7 +3791,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-support", "frame-system", @@ -3806,7 +3806,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-benchmarking", "frame-support", @@ -3827,7 +3827,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-support", "frame-system", @@ -3842,7 +3842,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-support", "frame-system", @@ -3855,7 +3855,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "enumflags2", "frame-support", @@ -3870,7 +3870,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-benchmarking", "frame-support", @@ -3885,7 +3885,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-support", "frame-system", @@ -3905,7 +3905,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-benchmarking", "frame-support", @@ -3921,7 +3921,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-support", "frame-system", @@ -3935,7 +3935,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-benchmarking", "frame-support", @@ -3957,7 +3957,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -3968,7 +3968,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-support", "frame-system", @@ -3982,7 +3982,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-benchmarking", "frame-support", @@ -4000,7 +4000,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-support", "frame-system", @@ -4017,7 +4017,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4035,7 +4035,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-support", "parity-scale-codec", @@ -4048,7 +4048,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-benchmarking", "frame-support", @@ -4063,7 +4063,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-benchmarking", "frame-support", @@ -4079,7 +4079,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5440,14 +5440,13 @@ dependencies = [ [[package]] name = "prometheus" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0575e258dab62268e7236d7307caa38848acbda7ec7ab87bd9093791e999d20" +checksum = "dd0ced56dee39a6e960c15c74dc48849d614586db2eaada6497477af7c7811cd" dependencies = [ "cfg-if", "fnv", "lazy_static", - "protobuf", "spin", "thiserror", ] @@ -5503,12 +5502,6 @@ dependencies = [ "prost", ] -[[package]] -name = "protobuf" -version = "2.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d883f78645c21b7281d21305181aa1f4dd9e9363e7cf2566c93121552cff003e" - [[package]] name = "quick-error" version = "1.2.3" @@ -6064,7 +6057,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "bytes 0.5.5", "derive_more 0.99.9", @@ -6091,7 +6084,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6115,7 +6108,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6132,7 +6125,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -6148,7 +6141,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -6159,7 +6152,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "ansi_term 0.12.1", "atty", @@ -6200,7 +6193,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "derive_more 0.99.9", "fnv", @@ -6236,7 +6229,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "blake2-rfc", "hash-db", @@ -6265,7 +6258,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "sc-client-api", "sp-blockchain", @@ -6276,7 +6269,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "derive_more 0.99.9", "fork-tree", @@ -6318,7 +6311,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -6342,7 +6335,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6355,7 +6348,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6378,7 +6371,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "log 0.4.8", "sc-client-api", @@ -6392,7 +6385,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "derive_more 0.99.9", "lazy_static", @@ -6420,7 +6413,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "derive_more 0.99.9", "log 0.4.8", @@ -6437,7 +6430,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6452,7 +6445,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -6473,7 +6466,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "assert_matches", "derive_more 0.99.9", @@ -6511,7 +6504,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "derive_more 0.99.9", "finality-grandpa", @@ -6528,7 +6521,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -6546,7 +6539,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "derive_more 0.99.9", "hex", @@ -6562,7 +6555,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "hash-db", "lazy_static", @@ -6581,7 +6574,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "bitflags", "bs58", @@ -6633,7 +6626,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6648,7 +6641,7 @@ dependencies = [ [[package]] name = "sc-network-test" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "env_logger", "futures 0.3.5", @@ -6675,7 +6668,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "bytes 0.5.5", "fnv", @@ -6702,7 +6695,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "futures 0.3.5", "libp2p", @@ -6715,7 +6708,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "log 0.4.8", "substrate-prometheus-endpoint", @@ -6724,7 +6717,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "futures 0.3.5", "hash-db", @@ -6756,7 +6749,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -6780,7 +6773,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -6796,7 +6789,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "derive_more 0.99.9", "directories", @@ -6858,7 +6851,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6872,7 +6865,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6893,7 +6886,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "erased-serde", "log 0.4.8", @@ -6910,7 +6903,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -6931,7 +6924,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -7386,7 +7379,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "derive_more 0.99.9", "log 0.4.8", @@ -7398,7 +7391,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "hash-db", "parity-scale-codec", @@ -7413,7 +7406,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -7425,7 +7418,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "parity-scale-codec", "serde", @@ -7437,7 +7430,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -7450,7 +7443,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "parity-scale-codec", "sp-api", @@ -7462,7 +7455,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7473,7 +7466,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "parity-scale-codec", "sp-api", @@ -7485,7 +7478,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "derive_more 0.99.9", "log 0.4.8", @@ -7502,7 +7495,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "serde", "serde_json", @@ -7511,7 +7504,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -7536,7 +7529,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "parity-scale-codec", "sp-api", @@ -7550,7 +7543,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "merlin", "parity-scale-codec", @@ -7569,7 +7562,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7578,7 +7571,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -7590,7 +7583,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "base58", "blake2-rfc", @@ -7634,7 +7627,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -7643,7 +7636,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -7653,7 +7646,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "environmental", "parity-scale-codec", @@ -7664,7 +7657,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "finality-grandpa", "log 0.4.8", @@ -7680,7 +7673,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7690,7 +7683,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "derive_more 0.99.9", "parity-scale-codec", @@ -7702,7 +7695,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "futures 0.3.5", "hash-db", @@ -7723,7 +7716,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "lazy_static", "sp-core", @@ -7734,7 +7727,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "parity-scale-codec", "serde", @@ -7746,7 +7739,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -7757,7 +7750,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "sp-api", "sp-core", @@ -7767,7 +7760,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "backtrace", "log 0.4.8", @@ -7776,7 +7769,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "serde", "sp-core", @@ -7785,7 +7778,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "either", "hash256-std-hasher", @@ -7807,7 +7800,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "parity-scale-codec", "primitive-types", @@ -7822,7 +7815,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "Inflector", "proc-macro-crate", @@ -7834,7 +7827,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "serde", "serde_json", @@ -7843,7 +7836,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "parity-scale-codec", "sp-api", @@ -7856,7 +7849,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7866,7 +7859,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "hash-db", "itertools 0.9.0", @@ -7887,12 +7880,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" [[package]] name = "sp-storage" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -7904,7 +7897,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7918,7 +7911,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "log 0.4.8", "rental", @@ -7928,7 +7921,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -7943,7 +7936,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "hash-db", "memory-db", @@ -7957,7 +7950,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "futures 0.3.5", "futures-core", @@ -7969,7 +7962,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -7981,7 +7974,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8112,7 +8105,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "chrono", "console_error_panic_hook", @@ -8138,7 +8131,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "platforms", ] @@ -8146,7 +8139,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -8169,7 +8162,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "async-std", "derive_more 0.99.9", @@ -8183,7 +8176,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "futures 0.1.29", "futures 0.3.5", @@ -8209,7 +8202,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "cfg-if", "frame-executive", @@ -8249,7 +8242,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" dependencies = [ "futures 0.3.5", "parity-scale-codec", @@ -8270,7 +8263,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.6" -source = "git+https://github.com/paritytech/substrate#8180062d6c1c542015988527fecf320974b21051" +source = "git+https://github.com/paritytech/substrate#f1c483a47c5a5e38a278bc1f16b92003c06e7e93" [[package]] name = "substrate-wasm-builder-runner" diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 0f2ec2b4a878..5bf394f0efd0 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -30,7 +30,7 @@ pub mod impls; use primitives::v0::BlockNumber; use sp_runtime::{Perquintill, Perbill, FixedPointNumber}; -use system::weights; +use system::limits; use frame_support::{ parameter_types, traits::{Currency}, weights::{Weight, constants::WEIGHT_PER_SECOND, DispatchClass}, @@ -77,20 +77,25 @@ parameter_types! { /// See `multiplier_can_grow_from_zero`. pub MinimumMultiplier: Multiplier = Multiplier::saturating_from_rational(1, 1_000_000_000u128); /// Maximum length of block. Up to 5MB. - pub BlockLength: weights::BlockLength = - weights::BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO); + pub BlockLength: limits::BlockLength = + limits::BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO); /// Block weights base values and limits. - pub BlockWeights: weights::BlockWeights = weights::BlockWeights::builder() + pub BlockWeights: limits::BlockWeights = limits::BlockWeights::builder() .base_block(BlockExecutionWeight::get()) - .base_extrinsic(ExtrinsicBaseWeight::get(), weights::ExtrinsicDispatchClass::All) - .max_for_class(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT, DispatchClass::Normal) - .max_for_class(MAXIMUM_BLOCK_WEIGHT, DispatchClass::Operational) - // Operational transactions have an extra reserved space, so that they - // are included even if block reached `MAXIMUM_BLOCK_WEIGHT`. - .reserved( - MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT, - DispatchClass::Operational - ) + .for_class(DispatchClass::all(), |weights| { + weights.base_extrinsic = ExtrinsicBaseWeight::get(); + }) + .for_class(DispatchClass::Normal, |weights| { + weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT); + }) + .for_class(DispatchClass::Operational, |weights| { + weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT); + // Operational transactions have an extra reserved space, so that they + // are included even if block reached `MAXIMUM_BLOCK_WEIGHT`. + weights.reserved = Some( + MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT, + ); + }) .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO) .build_or_panic(); } @@ -127,10 +132,10 @@ mod multiplier_tests { parameter_types! { pub const BlockHashCount: u64 = 250; pub const AvailableBlockRatio: Perbill = Perbill::one(); - pub BlockLength: system::weights::BlockLength = - system::weights::BlockLength::max(2 * 1024); - pub BlockWeights: system::weights::BlockWeights = - system::weights::BlockWeights::simple_max(1024); + pub BlockLength: system::limits::BlockLength = + system::limits::BlockLength::max(2 * 1024); + pub BlockWeights: system::limits::BlockWeights = + system::limits::BlockWeights::simple_max(1024); } impl system::Trait for Runtime { From 5b6f37bc41d8e5cce33a465392235a49e02f580c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Tue, 28 Jul 2020 15:37:54 +0200 Subject: [PATCH 05/13] Fix tests. --- runtime/common/src/claims.rs | 17 ++++++----------- runtime/common/src/crowdfund.rs | 18 +++++++----------- runtime/common/src/lib.rs | 10 +++++----- runtime/common/src/parachains.rs | 17 ++++++----------- runtime/common/src/purchase.rs | 17 ++++++----------- runtime/common/src/registrar.rs | 15 +++++---------- runtime/common/src/slots.rs | 20 ++++++-------------- runtime/kusama/src/constants.rs | 8 ++++---- runtime/parachains/src/mock.rs | 26 +++++++++----------------- runtime/polkadot/src/constants.rs | 8 ++++---- runtime/polkadot/tests/weights.rs | 10 +++++----- runtime/test-runtime/src/lib.rs | 15 +++++---------- runtime/westend/src/constants.rs | 8 ++++---- 13 files changed, 72 insertions(+), 117 deletions(-) diff --git a/runtime/common/src/claims.rs b/runtime/common/src/claims.rs index b56fa2ead7aa..beaf717293e3 100644 --- a/runtime/common/src/claims.rs +++ b/runtime/common/src/claims.rs @@ -636,7 +636,7 @@ mod tests { use codec::Encode; // The testing primitives are very useful for avoiding having to work with signatures // or public keys. `u64` is used as the `AccountId` and no `Signature`s are required. - use sp_runtime::{Perbill, traits::{BlakeTwo256, IdentityLookup, Identity}, testing::Header}; + use sp_runtime::{traits::{BlakeTwo256, IdentityLookup, Identity}, testing::Header}; use frame_support::{ impl_outer_origin, impl_outer_dispatch, assert_ok, assert_err, assert_noop, parameter_types, ord_parameter_types, weights::{Pays, GetDispatchInfo}, traits::ExistenceRequirement, @@ -661,12 +661,14 @@ mod tests { pub struct Test; parameter_types! { pub const BlockHashCount: u32 = 250; - pub const MaximumBlockWeight: u32 = 4 * 1024 * 1024; - pub const MaximumBlockLength: u32 = 4 * 1024 * 1024; - pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); + pub BlockWeights: system::limits::BlockWeights = + system::limits::BlockWeights::simple_max(4 * 1024 * 1024); } impl system::Trait for Test { type BaseCallFilter = (); + type BlockWeights = BlockWeights; + type BlockLength = (); + type DbWeight = (); type Origin = Origin; type Call = Call; type Index = u64; @@ -678,13 +680,6 @@ mod tests { type Header = Header; type Event = (); type BlockHashCount = BlockHashCount; - type MaximumBlockWeight = MaximumBlockWeight; - type DbWeight = (); - type BlockExecutionWeight = (); - type ExtrinsicBaseWeight = (); - type MaximumExtrinsicWeight = MaximumBlockWeight; - type MaximumBlockLength = MaximumBlockLength; - type AvailableBlockRatio = AvailableBlockRatio; type Version = (); type ModuleToIndex = (); type AccountData = balances::AccountData; diff --git a/runtime/common/src/crowdfund.rs b/runtime/common/src/crowdfund.rs index 942b31976610..c2d23c4ec1d6 100644 --- a/runtime/common/src/crowdfund.rs +++ b/runtime/common/src/crowdfund.rs @@ -572,7 +572,7 @@ mod tests { // The testing primitives are very useful for avoiding having to work with signatures // or public keys. `u64` is used as the `AccountId` and no `Signature`s are requried. use sp_runtime::{ - Perbill, Permill, Percent, testing::Header, DispatchResult, + Permill, Percent, testing::Header, DispatchResult, traits::{BlakeTwo256, IdentityLookup}, }; use crate::registrar::Registrar; @@ -588,12 +588,15 @@ mod tests { pub struct Test; parameter_types! { pub const BlockHashCount: u32 = 250; - pub const MaximumBlockWeight: u32 = 4 * 1024 * 1024; - pub const MaximumBlockLength: u32 = 4 * 1024 * 1024; - pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); + pub BlockWeights: system::limits::BlockWeights = + system::limits::BlockWeights::simple_max(4 * 1024 * 1024); } + impl system::Trait for Test { type BaseCallFilter = (); + type BlockWeights = BlockWeights; + type BlockLength = (); + type DbWeight = (); type Origin = Origin; type Call = (); type Index = u64; @@ -605,13 +608,6 @@ mod tests { type Header = Header; type Event = (); type BlockHashCount = BlockHashCount; - type MaximumBlockWeight = MaximumBlockWeight; - type DbWeight = (); - type BlockExecutionWeight = (); - type ExtrinsicBaseWeight = (); - type MaximumExtrinsicWeight = MaximumBlockWeight; - type MaximumBlockLength = MaximumBlockLength; - type AvailableBlockRatio = AvailableBlockRatio; type Version = (); type ModuleToIndex = (); type AccountData = balances::AccountData; diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 5bf394f0efd0..2c10c07fdcda 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -60,13 +60,12 @@ const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10); /// by Operational extrinsics. const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75); /// We allow for 2 seconds of compute with a 6 second average block time. -const MAXIMUM_BLOCK_WEIGHT: Weight = 2 * WEIGHT_PER_SECOND; +pub const MAXIMUM_BLOCK_WEIGHT: Weight = 2 * WEIGHT_PER_SECOND; // Common constants used in all runtimes. parameter_types! { pub const BlockHashCount: BlockNumber = 2400; - pub const MaximumBlockLength: u32 = 5 * 1024 * 1024; - /// The portion of the `AvailableBlockRatio` that we adjust the fees with. Blocks filled less + /// The portion of the `NORMAL_DISPATCH_RATIO` that we adjust the fees with. Blocks filled less /// than this will decrease the weight and more will increase. pub const TargetBlockFullness: Perquintill = Perquintill::from_percent(25); /// The adjustment variable of the runtime. Higher values will cause `TargetBlockFullness` to @@ -168,7 +167,7 @@ mod multiplier_tests { let mut t: sp_io::TestExternalities = system::GenesisConfig::default().build_storage::().unwrap().into(); t.execute_with(|| { - System::set_block_limits(w, 0); + System::set_block_consumed_resources(w, 0); assertions() }); } @@ -176,7 +175,8 @@ mod multiplier_tests { #[test] fn multiplier_can_grow_from_zero() { let minimum_multiplier = MinimumMultiplier::get(); - let target = TargetBlockFullness::get() * (AvailableBlockRatio::get() * MaximumBlockWeight::get()); + let target = TargetBlockFullness::get() * + BlockWeights::get().get(DispatchClass::Normal).max_total.unwrap(); // if the min is too small, then this will not change, and we are doomed forever. // the weight is 1/10th bigger than target. run_with_system_weight(target * 101 / 100, || { diff --git a/runtime/common/src/parachains.rs b/runtime/common/src/parachains.rs index a5d81989aa55..4a8573868c8c 100644 --- a/runtime/common/src/parachains.rs +++ b/runtime/common/src/parachains.rs @@ -1724,13 +1724,15 @@ mod tests { pub struct Test; parameter_types! { pub const BlockHashCount: u32 = 250; - pub const MaximumBlockWeight: Weight = 4 * 1024 * 1024; - pub const MaximumBlockLength: u32 = 4 * 1024 * 1024; - pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); + pub BlockWeights: system::limits::BlockWeights = + system::limits::BlockWeights::simple_max(4 * 1024 * 1024); } impl system::Trait for Test { type BaseCallFilter = (); + type BlockWeights = BlockWeights; + type BlockLength = (); + type DbWeight = (); type Origin = Origin; type Call = Call; type Index = u64; @@ -1742,13 +1744,6 @@ mod tests { type Header = Header; type Event = (); type BlockHashCount = BlockHashCount; - type MaximumBlockWeight = MaximumBlockWeight; - type DbWeight = (); - type BlockExecutionWeight = (); - type ExtrinsicBaseWeight = (); - type MaximumExtrinsicWeight = MaximumBlockWeight; - type MaximumBlockLength = MaximumBlockLength; - type AvailableBlockRatio = AvailableBlockRatio; type Version = (); type ModuleToIndex = (); type AccountData = balances::AccountData; @@ -1953,7 +1948,7 @@ mod tests { } parameter_types! { - pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get(); + pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * BlockWeights::get().max_block; } impl offences::Trait for Test { diff --git a/runtime/common/src/purchase.rs b/runtime/common/src/purchase.rs index 9a1856a549df..3a62d8f969f9 100644 --- a/runtime/common/src/purchase.rs +++ b/runtime/common/src/purchase.rs @@ -379,7 +379,7 @@ mod tests { // The testing primitives are very useful for avoiding having to work with signatures // or public keys. `u64` is used as the `AccountId` and no `Signature`s are required. use sp_runtime::{ - Perbill, MultiSignature, + MultiSignature, traits::{BlakeTwo256, IdentityLookup, Identity, Verify, IdentifyAccount, Dispatchable}, testing::Header }; @@ -410,12 +410,14 @@ mod tests { pub struct Test; parameter_types! { pub const BlockHashCount: u32 = 250; - pub const MaximumBlockWeight: u32 = 4 * 1024 * 1024; - pub const MaximumBlockLength: u32 = 4 * 1024 * 1024; - pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); + pub BlockWeights: system::limits::BlockWeights = + system::limits::BlockWeights::simple_max(4 * 1024 * 1024); } impl system::Trait for Test { type BaseCallFilter = (); + type BlockWeights = BlockWeights; + type BlockLength = (); + type DbWeight = (); type Origin = Origin; type Call = Call; type Index = u64; @@ -427,13 +429,6 @@ mod tests { type Header = Header; type Event = (); type BlockHashCount = BlockHashCount; - type MaximumBlockWeight = MaximumBlockWeight; - type DbWeight = (); - type BlockExecutionWeight = (); - type ExtrinsicBaseWeight = (); - type MaximumExtrinsicWeight = MaximumBlockWeight; - type MaximumBlockLength = MaximumBlockLength; - type AvailableBlockRatio = AvailableBlockRatio; type Version = (); type ModuleToIndex = (); type AccountData = balances::AccountData; diff --git a/runtime/common/src/registrar.rs b/runtime/common/src/registrar.rs index 5493d20839f5..01e96ee00c05 100644 --- a/runtime/common/src/registrar.rs +++ b/runtime/common/src/registrar.rs @@ -716,12 +716,14 @@ mod tests { pub struct Test; parameter_types! { pub const BlockHashCount: u32 = 250; - pub const MaximumBlockWeight: u32 = 4 * 1024 * 1024; - pub const MaximumBlockLength: u32 = 4 * 1024 * 1024; - pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); + pub BlockWeights: system::limits::BlockWeights = + system::limits::BlockWeights::simple_max(4 * 1024 * 1024); } impl system::Trait for Test { type BaseCallFilter = (); + type BlockWeights = BlockWeights; + type BlockLength = (); + type DbWeight = (); type Origin = Origin; type Call = Call; type Index = u64; @@ -733,13 +735,6 @@ mod tests { type Header = Header; type Event = (); type BlockHashCount = BlockHashCount; - type MaximumBlockWeight = MaximumBlockWeight; - type DbWeight = (); - type BlockExecutionWeight = (); - type ExtrinsicBaseWeight = (); - type MaximumExtrinsicWeight = MaximumBlockWeight; - type MaximumBlockLength = MaximumBlockLength; - type AvailableBlockRatio = AvailableBlockRatio; type Version = (); type ModuleToIndex = (); type AccountData = balances::AccountData; diff --git a/runtime/common/src/slots.rs b/runtime/common/src/slots.rs index 5fe4c3b048ad..8fca6c89da35 100644 --- a/runtime/common/src/slots.rs +++ b/runtime/common/src/slots.rs @@ -881,10 +881,7 @@ mod tests { use std::{collections::HashMap, cell::RefCell}; use sp_core::H256; - use sp_runtime::{ - Perbill, - traits::{BlakeTwo256, Hash, IdentityLookup}, - }; + use sp_runtime::traits::{BlakeTwo256, Hash, IdentityLookup}; use frame_support::{ impl_outer_origin, parameter_types, assert_ok, assert_noop, traits::{OnInitialize, OnFinalize} @@ -903,12 +900,14 @@ mod tests { pub struct Test; parameter_types! { pub const BlockHashCount: u32 = 250; - pub const MaximumBlockWeight: u32 = 4 * 1024 * 1024; - pub const MaximumBlockLength: u32 = 4 * 1024 * 1024; - pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); + pub BlockWeights: system::limits::BlockWeights = + system::limits::BlockWeights::simple_max(4 * 1024 * 1024); } impl system::Trait for Test { type BaseCallFilter = (); + type BlockWeights = BlockWeights; + type BlockLength = (); + type DbWeight = (); type Origin = Origin; type Call = (); type Index = u64; @@ -920,13 +919,6 @@ mod tests { type Header = Header; type Event = (); type BlockHashCount = BlockHashCount; - type MaximumBlockWeight = MaximumBlockWeight; - type DbWeight = (); - type BlockExecutionWeight = (); - type ExtrinsicBaseWeight = (); - type MaximumExtrinsicWeight = MaximumBlockWeight; - type MaximumBlockLength = MaximumBlockLength; - type AvailableBlockRatio = AvailableBlockRatio; type Version = (); type ModuleToIndex = (); type AccountData = balances::AccountData; diff --git a/runtime/kusama/src/constants.rs b/runtime/kusama/src/constants.rs index 560d83347d9b..91d6b3545225 100644 --- a/runtime/kusama/src/constants.rs +++ b/runtime/kusama/src/constants.rs @@ -69,7 +69,7 @@ pub mod fee { /// node's balance type. /// /// This should typically create a mapping between the following ranges: - /// - [0, system::MaximumBlockWeight] + /// - [0, MAXIMUM_BLOCK_WEIGHT] /// - [Balance::min, Balance::max] /// /// Yet, it can be used for any other sort of change to weight-fee. Some examples being: @@ -95,16 +95,16 @@ pub mod fee { #[cfg(test)] mod tests { use frame_support::weights::WeightToFeePolynomial; - use runtime_common::{MaximumBlockWeight, ExtrinsicBaseWeight}; + use runtime_common::{MAXIMUM_BLOCK_WEIGHT, ExtrinsicBaseWeight}; use super::fee::WeightToFee; use super::currency::{CENTS, DOLLARS, MILLICENTS}; #[test] - // This function tests that the fee for `MaximumBlockWeight` of weight is correct + // This function tests that the fee for `MAXIMUM_BLOCK_WEIGHT` of weight is correct fn full_block_fee_is_correct() { // A full block should cost 16 DOLLARS println!("Base: {}", ExtrinsicBaseWeight::get()); - let x = WeightToFee::calc(&MaximumBlockWeight::get()); + let x = WeightToFee::calc(&MAXIMUM_BLOCK_WEIGHT); let y = 16 * DOLLARS; assert!(x.max(y) - x.min(y) < MILLICENTS); } diff --git a/runtime/parachains/src/mock.rs b/runtime/parachains/src/mock.rs index 21ee83433d5d..8daa1ee035a0 100644 --- a/runtime/parachains/src/mock.rs +++ b/runtime/parachains/src/mock.rs @@ -17,17 +17,14 @@ //! Mocks for all the traits. use sp_io::TestExternalities; -use sp_core::{H256}; -use sp_runtime::{ - Perbill, - traits::{ - BlakeTwo256, IdentityLookup, - }, +use sp_core::H256; +use sp_runtime::traits::{ + BlakeTwo256, IdentityLookup, }; use primitives::v1::{BlockNumber, Header}; use frame_support::{ impl_outer_origin, impl_outer_dispatch, impl_outer_event, parameter_types, - weights::Weight, traits::Randomness as RandomnessT, + traits::Randomness as RandomnessT, }; use crate::inclusion; @@ -62,13 +59,15 @@ impl RandomnessT for TestRandomness { parameter_types! { pub const BlockHashCount: u32 = 250; - pub const MaximumBlockWeight: Weight = 4 * 1024 * 1024; - pub const MaximumBlockLength: u32 = 4 * 1024 * 1024; - pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); + pub BlockWeights: system::limits::BlockWeights = + system::limits::BlockWeights::simple_max(4 * 1024 * 1024); } impl system::Trait for Test { type BaseCallFilter = (); + type BlockWeights = BlockWeights; + type BlockLength = (); + type DbWeight = (); type Origin = Origin; type Call = Call; type Index = u64; @@ -80,13 +79,6 @@ impl system::Trait for Test { type Header = Header; type Event = TestEvent; type BlockHashCount = BlockHashCount; - type MaximumBlockWeight = MaximumBlockWeight; - type DbWeight = (); - type BlockExecutionWeight = (); - type ExtrinsicBaseWeight = (); - type MaximumExtrinsicWeight = MaximumBlockWeight; - type MaximumBlockLength = MaximumBlockLength; - type AvailableBlockRatio = AvailableBlockRatio; type Version = (); type ModuleToIndex = (); type AccountData = balances::AccountData; diff --git a/runtime/polkadot/src/constants.rs b/runtime/polkadot/src/constants.rs index 8ad5478bcab8..d6704f3eb069 100644 --- a/runtime/polkadot/src/constants.rs +++ b/runtime/polkadot/src/constants.rs @@ -61,7 +61,7 @@ pub mod fee { /// node's balance type. /// /// This should typically create a mapping between the following ranges: - /// - [0, system::MaximumBlockWeight] + /// - [0, MAXIMUM_BLOCK_WEIGHT] /// - [Balance::min, Balance::max] /// /// Yet, it can be used for any other sort of change to weight-fee. Some examples being: @@ -87,16 +87,16 @@ pub mod fee { #[cfg(test)] mod tests { use frame_support::weights::WeightToFeePolynomial; - use runtime_common::{MaximumBlockWeight, ExtrinsicBaseWeight}; + use runtime_common::{MAXIMUM_BLOCK_WEIGHT, ExtrinsicBaseWeight}; use super::fee::WeightToFee; use super::currency::{CENTS, DOLLARS, MILLICENTS}; #[test] - // This function tests that the fee for `MaximumBlockWeight` of weight is correct + // This function tests that the fee for `MAXIMUM_BLOCK_WEIGHT` of weight is correct fn full_block_fee_is_correct() { // A full block should cost 16 DOLLARS println!("Base: {}", ExtrinsicBaseWeight::get()); - let x = WeightToFee::calc(&MaximumBlockWeight::get()); + let x = WeightToFee::calc(&MAXIMUM_BLOCK_WEIGHT); let y = 16 * DOLLARS; assert!(x.max(y) - x.min(y) < MILLICENTS); } diff --git a/runtime/polkadot/tests/weights.rs b/runtime/polkadot/tests/weights.rs index 3cdb71995801..ed90a4e166c6 100644 --- a/runtime/polkadot/tests/weights.rs +++ b/runtime/polkadot/tests/weights.rs @@ -30,7 +30,7 @@ use keyring::AccountKeyring; use polkadot_runtime::constants::currency::*; use polkadot_runtime::{self, Runtime}; use primitives::v0::AccountId; -use runtime_common::MaximumBlockWeight; +use runtime_common::MAXIMUM_BLOCK_WEIGHT; use democracy::Call as DemocracyCall; use elections_phragmen::Call as PhragmenCall; @@ -122,8 +122,8 @@ fn weight_of_staking_nominate_is_correct() { #[test] fn weight_of_system_set_code_is_correct() { - // #[weight = (T::MaximumBlockWeight::get(), DispatchClass::Operational)] - let expected_weight = MaximumBlockWeight::get(); + // #[weight = (T::block_weights().max_block, DispatchClass::Operational)] + let expected_weight = MAXIMUM_BLOCK_WEIGHT; let weight = SystemCall::set_code::(vec![]).get_dispatch_info().weight; assert_eq!(weight, expected_weight); @@ -208,8 +208,8 @@ fn weight_of_democracy_vote_is_correct() { #[test] fn weight_of_democracy_enact_proposal_is_correct() { - // #[weight = T::MaximumBlockWeight::get()] - let expected_weight = MaximumBlockWeight::get(); + // #[weight = T::block_weights().max_block] + let expected_weight = MAXIMUM_BLOCK_WEIGHT; let weight = DemocracyCall::enact_proposal::(Default::default(), Default::default()).get_dispatch_info().weight; diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index 4704ff0fb014..f9d3eba8fec6 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -30,8 +30,7 @@ use primitives::v0::{ use runtime_common::{ attestations, claims, parachains, registrar, slots, SlowAdjustingFeeUpdate, impls::CurrencyToVoteHandler, - BlockHashCount, MaximumBlockWeight, AvailableBlockRatio, - MaximumBlockLength, BlockExecutionWeight, ExtrinsicBaseWeight, + BlockHashCount, BlockWeights, }; use sp_runtime::{ create_runtime_str, generic, impl_opaque_keys, @@ -132,6 +131,9 @@ parameter_types! { impl system::Trait for Runtime { type BaseCallFilter = (); + type BlockWeights = BlockWeights; + type BlockLength = (); + type DbWeight = (); type Origin = Origin; type Call = Call; type Index = Nonce; @@ -143,13 +145,6 @@ impl system::Trait for Runtime { type Header = generic::Header; type Event = Event; type BlockHashCount = BlockHashCount; - type MaximumBlockWeight = MaximumBlockWeight; - type DbWeight = (); - type BlockExecutionWeight = BlockExecutionWeight; - type ExtrinsicBaseWeight = ExtrinsicBaseWeight; - type MaximumExtrinsicWeight = MaximumBlockWeight; - type MaximumBlockLength = MaximumBlockLength; - type AvailableBlockRatio = AvailableBlockRatio; type Version = Version; type ModuleToIndex = ModuleToIndex; type AccountData = balances::AccountData; @@ -448,7 +443,7 @@ impl system::offchain::SigningTypes for Runtime { } parameter_types! { - pub storage OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get(); + pub storage OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * BlockWeights::get().max_block; } impl offences::Trait for Runtime { diff --git a/runtime/westend/src/constants.rs b/runtime/westend/src/constants.rs index f59a384fba8b..ed740007041b 100644 --- a/runtime/westend/src/constants.rs +++ b/runtime/westend/src/constants.rs @@ -61,7 +61,7 @@ pub mod fee { /// node's balance type. /// /// This should typically create a mapping between the following ranges: - /// - [0, system::MaximumBlockWeight] + /// - [0, MAXIMUM_BLOCK_WEIGHT] /// - [Balance::min, Balance::max] /// /// Yet, it can be used for any other sort of change to weight-fee. Some examples being: @@ -87,16 +87,16 @@ pub mod fee { #[cfg(test)] mod tests { use frame_support::weights::WeightToFeePolynomial; - use runtime_common::{MaximumBlockWeight, ExtrinsicBaseWeight}; + use runtime_common::{MAXIMUM_BLOCK_WEIGHT, ExtrinsicBaseWeight}; use super::fee::WeightToFee; use super::currency::{CENTS, DOLLARS, MILLICENTS}; #[test] - // This function tests that the fee for `MaximumBlockWeight` of weight is correct + // This function tests that the fee for `MAXIMUM_BLOCK_WEIGHT` of weight is correct fn full_block_fee_is_correct() { // A full block should cost 16 DOLLARS println!("Base: {}", ExtrinsicBaseWeight::get()); - let x = WeightToFee::calc(&MaximumBlockWeight::get()); + let x = WeightToFee::calc(&MAXIMUM_BLOCK_WEIGHT); let y = 16 * DOLLARS; assert!(x.max(y) - x.min(y) < MILLICENTS); } From 1694d3910d7ea50227d2f7b048becb3f8373ede6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Wed, 5 Aug 2020 16:40:55 +0200 Subject: [PATCH 06/13] Fix compilation. --- runtime/common/src/claims.rs | 4 +--- runtime/common/src/lib.rs | 4 ++-- runtime/kusama/src/lib.rs | 7 +------ 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/runtime/common/src/claims.rs b/runtime/common/src/claims.rs index 942d3e90d36f..8b9516b30e49 100644 --- a/runtime/common/src/claims.rs +++ b/runtime/common/src/claims.rs @@ -661,12 +661,10 @@ mod tests { pub struct Test; parameter_types! { pub const BlockHashCount: u32 = 250; - pub BlockWeights: system::limits::BlockWeights = - system::limits::BlockWeights::simple_max(4 * 1024 * 1024); } impl frame_system::Trait for Test { type BaseCallFilter = (); - type BlockWeights = BlockWeights; + type BlockWeights = (); type BlockLength = (); type DbWeight = (); type Origin = Origin; diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 92b0c82c04a2..6b4f81b76ef3 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -63,6 +63,8 @@ const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75); /// We allow for 2 seconds of compute with a 6 second average block time. pub const MAXIMUM_BLOCK_WEIGHT: Weight = 2 * WEIGHT_PER_SECOND; +const_assert!(NORMAL_DISPATCH_RATIO.deconstruct() >= AVERAGE_ON_INITIALIZE_RATIO.deconstruct()); + // Common constants used in all runtimes. parameter_types! { pub const BlockHashCount: BlockNumber = 2400; @@ -100,8 +102,6 @@ parameter_types! { .build_or_panic(); } -const_assert!(NORMAL_DISPATCH_RATIO.deconstruct() >= AVERAGE_ON_INITIALIZE_RATIO.deconstruct()); - /// Parameterized slow adjusting fee updated based on /// https://w3f-research.readthedocs.io/en/latest/polkadot/Token%20Economics.html#-2.-slow-adjusting-mechanism pub type SlowAdjustingFeeUpdate = TargetedFeeAdjustment< diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 539e095243ca..3f5b6c6bbc32 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -926,13 +926,8 @@ impl pallet_proxy::Trait for Runtime { pub struct CustomOnRuntimeUpgrade; impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade { fn on_runtime_upgrade() -> frame_support::weights::Weight { -<<<<<<< HEAD - if scheduler::Module::::migrate_v1_to_t2() { - ::BlockWeights::get().max_block -======= if pallet_scheduler::Module::::migrate_v1_to_t2() { - ::MaximumBlockWeight::get() ->>>>>>> master + ::BlockWeights::get().max_block } else { ::DbWeight::get().reads(1) + 500_000_000 } From eee7c591f81b1ed6065fadfc0b35aba33ec1b263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Thu, 6 Aug 2020 13:19:05 +0200 Subject: [PATCH 07/13] Fix frame system imports. --- runtime/common/src/lib.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 6b4f81b76ef3..e507f2af6aca 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -31,7 +31,7 @@ pub mod paras_sudo_wrapper; use primitives::v0::BlockNumber; use sp_runtime::{Perquintill, Perbill, FixedPointNumber}; -use system::limits; +use frame_system::limits; use frame_support::{ parameter_types, traits::{Currency}, weights::{Weight, constants::WEIGHT_PER_SECOND, DispatchClass}, @@ -132,10 +132,10 @@ mod multiplier_tests { parameter_types! { pub const BlockHashCount: u64 = 250; pub const AvailableBlockRatio: Perbill = Perbill::one(); - pub BlockLength: system::limits::BlockLength = - system::limits::BlockLength::max(2 * 1024); - pub BlockWeights: system::limits::BlockWeights = - system::limits::BlockWeights::simple_max(1024); + pub BlockLength: frame_system::limits::BlockLength = + frame_system::limits::BlockLength::max(2 * 1024); + pub BlockWeights: frame_system::limits::BlockWeights = + frame_system::limits::BlockWeights::simple_max(1024); } impl frame_system::Trait for Runtime { From 61c9b1588fbbe3851134bd6e800f8864cbf0b7d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Thu, 6 Aug 2020 16:19:33 +0200 Subject: [PATCH 08/13] Fix usages of system --- runtime/common/src/crowdfund.rs | 4 +--- runtime/common/src/parachains.rs | 4 +--- runtime/common/src/purchase.rs | 4 +--- runtime/common/src/registrar.rs | 4 +--- runtime/common/src/slots.rs | 4 +--- runtime/kusama/src/lib.rs | 2 +- runtime/parachains/src/mock.rs | 4 ++-- 7 files changed, 8 insertions(+), 18 deletions(-) diff --git a/runtime/common/src/crowdfund.rs b/runtime/common/src/crowdfund.rs index d8fa975d17d2..a5093e9fbf33 100644 --- a/runtime/common/src/crowdfund.rs +++ b/runtime/common/src/crowdfund.rs @@ -588,13 +588,11 @@ mod tests { pub struct Test; parameter_types! { pub const BlockHashCount: u32 = 250; - pub BlockWeights: system::limits::BlockWeights = - system::limits::BlockWeights::simple_max(4 * 1024 * 1024); } impl frame_system::Trait for Test { type BaseCallFilter = (); - type BlockWeights = BlockWeights; + type BlockWeights = (); type BlockLength = (); type DbWeight = (); type Origin = Origin; diff --git a/runtime/common/src/parachains.rs b/runtime/common/src/parachains.rs index 438bf00bbf56..5f2eacaa0809 100644 --- a/runtime/common/src/parachains.rs +++ b/runtime/common/src/parachains.rs @@ -1724,13 +1724,11 @@ mod tests { pub struct Test; parameter_types! { pub const BlockHashCount: u32 = 250; - pub BlockWeights: system::limits::BlockWeights = - system::limits::BlockWeights::simple_max(4 * 1024 * 1024); } impl frame_system::Trait for Test { type BaseCallFilter = (); - type BlockWeights = BlockWeights; + type BlockWeights = (); type BlockLength = (); type DbWeight = (); type Origin = Origin; diff --git a/runtime/common/src/purchase.rs b/runtime/common/src/purchase.rs index 1453812e1b6d..2c721f83f9db 100644 --- a/runtime/common/src/purchase.rs +++ b/runtime/common/src/purchase.rs @@ -410,12 +410,10 @@ mod tests { pub struct Test; parameter_types! { pub const BlockHashCount: u32 = 250; - pub BlockWeights: system::limits::BlockWeights = - system::limits::BlockWeights::simple_max(4 * 1024 * 1024); } impl frame_system::Trait for Test { type BaseCallFilter = (); - type BlockWeights = BlockWeights; + type BlockWeights = (); type BlockLength = (); type DbWeight = (); type Origin = Origin; diff --git a/runtime/common/src/registrar.rs b/runtime/common/src/registrar.rs index 7b5a0b0efc31..c246c29cd61c 100644 --- a/runtime/common/src/registrar.rs +++ b/runtime/common/src/registrar.rs @@ -716,12 +716,10 @@ mod tests { pub struct Test; parameter_types! { pub const BlockHashCount: u32 = 250; - pub BlockWeights: system::limits::BlockWeights = - system::limits::BlockWeights::simple_max(4 * 1024 * 1024); } impl frame_system::Trait for Test { type BaseCallFilter = (); - type BlockWeights = BlockWeights; + type BlockWeights = (); type BlockLength = (); type DbWeight = (); type Origin = Origin; diff --git a/runtime/common/src/slots.rs b/runtime/common/src/slots.rs index dc5cde7eabe3..4c5342f7c5fe 100644 --- a/runtime/common/src/slots.rs +++ b/runtime/common/src/slots.rs @@ -900,12 +900,10 @@ mod tests { pub struct Test; parameter_types! { pub const BlockHashCount: u32 = 250; - pub BlockWeights: system::limits::BlockWeights = - system::limits::BlockWeights::simple_max(4 * 1024 * 1024); } impl frame_system::Trait for Test { type BaseCallFilter = (); - type BlockWeights = BlockWeights; + type BlockWeights = (); type BlockLength = (); type DbWeight = (); type Origin = Origin; diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 3f5b6c6bbc32..b707086d14dc 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -927,7 +927,7 @@ pub struct CustomOnRuntimeUpgrade; impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade { fn on_runtime_upgrade() -> frame_support::weights::Weight { if pallet_scheduler::Module::::migrate_v1_to_t2() { - ::BlockWeights::get().max_block + ::BlockWeights::get().max_block } else { ::DbWeight::get().reads(1) + 500_000_000 } diff --git a/runtime/parachains/src/mock.rs b/runtime/parachains/src/mock.rs index 22e5c4ad04ad..1416f9f4d872 100644 --- a/runtime/parachains/src/mock.rs +++ b/runtime/parachains/src/mock.rs @@ -59,8 +59,8 @@ impl RandomnessT for TestRandomness { parameter_types! { pub const BlockHashCount: u32 = 250; - pub BlockWeights: system::limits::BlockWeights = - system::limits::BlockWeights::simple_max(4 * 1024 * 1024); + pub BlockWeights: frame_system::limits::BlockWeights = + frame_system::limits::BlockWeights::simple_max(4 * 1024 * 1024); } impl frame_system::Trait for Test { From 5aac418f11b43fea0e7597447ceb2e8b68384e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Fri, 7 Aug 2020 10:50:42 +0200 Subject: [PATCH 09/13] Fix stuff. --- runtime/common/src/parachains.rs | 3 ++- runtime/rococo-v1/src/constants.rs | 13 +++++++------ runtime/rococo-v1/src/lib.rs | 15 +++++---------- runtime/rococo/src/constants.rs | 15 ++++++++------- runtime/rococo/src/lib.rs | 22 +++++++++++----------- 5 files changed, 33 insertions(+), 35 deletions(-) diff --git a/runtime/common/src/parachains.rs b/runtime/common/src/parachains.rs index 5f2eacaa0809..1ec0d157cb23 100644 --- a/runtime/common/src/parachains.rs +++ b/runtime/common/src/parachains.rs @@ -1946,7 +1946,8 @@ mod tests { } parameter_types! { - pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * BlockWeights::get().max_block; + pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) + * <() as Get>::get().max_block; } impl pallet_offences::Trait for Test { diff --git a/runtime/rococo-v1/src/constants.rs b/runtime/rococo-v1/src/constants.rs index a565ca4dbcfd..a18cd34b28db 100644 --- a/runtime/rococo-v1/src/constants.rs +++ b/runtime/rococo-v1/src/constants.rs @@ -86,8 +86,8 @@ pub mod fee { #[cfg(test)] mod tests { - use frame_support::weights::WeightToFeePolynomial; - use runtime_common::{MaximumBlockWeight, ExtrinsicBaseWeight}; + use frame_support::weights::{WeightToFeePolynomial, DispatchClass}; + use runtime_common::BlockWeights; use super::fee::WeightToFee; use super::currency::{CENTS, DOLLARS, MILLICENTS}; @@ -95,8 +95,8 @@ mod tests { // This function tests that the fee for `MaximumBlockWeight` of weight is correct fn full_block_fee_is_correct() { // A full block should cost 16 DOLLARS - println!("Base: {}", ExtrinsicBaseWeight::get()); - let x = WeightToFee::calc(&MaximumBlockWeight::get()); + println!("Base: {}", BlockWeights::get().get(DispatchClass::Normal).base_extrinsic); + let x = WeightToFee::calc(&BlockWeights::get().max_block); let y = 16 * DOLLARS; assert!(x.max(y) - x.min(y) < MILLICENTS); } @@ -105,8 +105,9 @@ mod tests { // This function tests that the fee for `ExtrinsicBaseWeight` of weight is correct fn extrinsic_base_fee_is_correct() { // `ExtrinsicBaseWeight` should cost 1/10 of a CENT - println!("Base: {}", ExtrinsicBaseWeight::get()); - let x = WeightToFee::calc(&ExtrinsicBaseWeight::get()); + let base_weight = BlockWeights::get().get(DispatchClass::Normal).base_extrinsic; + println!("Base: {}", base_weight); + let x = WeightToFee::calc(&base_weight); let y = CENTS / 10; assert!(x.max(y) - x.min(y) < MILLICENTS); } diff --git a/runtime/rococo-v1/src/lib.rs b/runtime/rococo-v1/src/lib.rs index f1af47613ed1..efe02bd73c34 100644 --- a/runtime/rococo-v1/src/lib.rs +++ b/runtime/rococo-v1/src/lib.rs @@ -31,8 +31,7 @@ use primitives::v1::{ use runtime_common::{ SlowAdjustingFeeUpdate, impls::{CurrencyToVoteHandler, ToAuthor}, - BlockHashCount, MaximumBlockWeight, AvailableBlockRatio, MaximumBlockLength, - BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, MaximumExtrinsicWeight, + BlockHashCount, BlockWeights, BlockLength, RocksDbWeight, }; use runtime_parachains::{ self, @@ -402,6 +401,9 @@ parameter_types! { impl frame_system::Trait for Runtime { type BaseCallFilter = BaseFilter; + type BlockWeights = BlockWeights; + type BlockLength = BlockLength; + type DbWeight = RocksDbWeight; type Origin = Origin; type Call = Call; type Index = Nonce; @@ -413,13 +415,6 @@ impl frame_system::Trait for Runtime { type Header = generic::Header; type Event = Event; type BlockHashCount = BlockHashCount; - type MaximumBlockWeight = MaximumBlockWeight; - type DbWeight = RocksDbWeight; - type BlockExecutionWeight = BlockExecutionWeight; - type ExtrinsicBaseWeight = ExtrinsicBaseWeight; - type MaximumExtrinsicWeight = MaximumExtrinsicWeight; - type MaximumBlockLength = MaximumBlockLength; - type AvailableBlockRatio = AvailableBlockRatio; type Version = Version; type ModuleToIndex = ModuleToIndex; type AccountData = pallet_balances::AccountData; @@ -585,7 +580,7 @@ parameter_types! { } parameter_types! { - pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get(); + pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * BlockWeights::get().max_block; } impl pallet_offences::Trait for Runtime { diff --git a/runtime/rococo/src/constants.rs b/runtime/rococo/src/constants.rs index a565ca4dbcfd..285d1c359eab 100644 --- a/runtime/rococo/src/constants.rs +++ b/runtime/rococo/src/constants.rs @@ -61,7 +61,7 @@ pub mod fee { /// node's balance type. /// /// This should typically create a mapping between the following ranges: - /// - [0, frame_system::MaximumBlockWeight] + /// - [0, MAXIMUM_BLOCK_WEIGHT] /// - [Balance::min, Balance::max] /// /// Yet, it can be used for any other sort of change to weight-fee. Some examples being: @@ -86,8 +86,8 @@ pub mod fee { #[cfg(test)] mod tests { - use frame_support::weights::WeightToFeePolynomial; - use runtime_common::{MaximumBlockWeight, ExtrinsicBaseWeight}; + use frame_support::weights::{WeightToFeePolynomial, DispatchClass}; + use runtime_common::BlockWeights; use super::fee::WeightToFee; use super::currency::{CENTS, DOLLARS, MILLICENTS}; @@ -95,8 +95,8 @@ mod tests { // This function tests that the fee for `MaximumBlockWeight` of weight is correct fn full_block_fee_is_correct() { // A full block should cost 16 DOLLARS - println!("Base: {}", ExtrinsicBaseWeight::get()); - let x = WeightToFee::calc(&MaximumBlockWeight::get()); + println!("Base: {}", BlockWeights::get().get(DispatchClass::Normal).base_extrinsic); + let x = WeightToFee::calc(&BlockWeights::get().max_block); let y = 16 * DOLLARS; assert!(x.max(y) - x.min(y) < MILLICENTS); } @@ -105,8 +105,9 @@ mod tests { // This function tests that the fee for `ExtrinsicBaseWeight` of weight is correct fn extrinsic_base_fee_is_correct() { // `ExtrinsicBaseWeight` should cost 1/10 of a CENT - println!("Base: {}", ExtrinsicBaseWeight::get()); - let x = WeightToFee::calc(&ExtrinsicBaseWeight::get()); + let base_weight = BlockWeights::get().get(DispatchClass::Normal).base_extrinsic; + println!("Base: {}", base_weight); + let x = WeightToFee::calc(&base_weight); let y = CENTS / 10; assert!(x.max(y) - x.min(y) < MILLICENTS); } diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index c8fa47230a19..44247db586e2 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -30,8 +30,7 @@ use primitives::v0::{ use runtime_common::{ attestations, parachains, registrar, SlowAdjustingFeeUpdate, impls::ToAuthor, - BlockHashCount, MaximumBlockWeight, AvailableBlockRatio, MaximumBlockLength, - BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, MaximumExtrinsicWeight, + BlockHashCount, BlockWeights, BlockLength, RocksDbWeight, }; use sp_runtime::{ create_runtime_str, generic, impl_opaque_keys, @@ -114,6 +113,9 @@ parameter_types! { impl frame_system::Trait for Runtime { type BaseCallFilter = BaseFilter; + type BlockWeights = BlockWeights; + type BlockLength = BlockLength; + type DbWeight = RocksDbWeight; type Origin = Origin; type Call = Call; type Index = Nonce; @@ -125,13 +127,6 @@ impl frame_system::Trait for Runtime { type Header = generic::Header; type Event = Event; type BlockHashCount = BlockHashCount; - type MaximumBlockWeight = MaximumBlockWeight; - type DbWeight = RocksDbWeight; - type BlockExecutionWeight = BlockExecutionWeight; - type ExtrinsicBaseWeight = ExtrinsicBaseWeight; - type MaximumExtrinsicWeight = MaximumExtrinsicWeight; - type MaximumBlockLength = MaximumBlockLength; - type AvailableBlockRatio = AvailableBlockRatio; type Version = Version; type ModuleToIndex = ModuleToIndex; type AccountData = pallet_balances::AccountData; @@ -140,12 +135,17 @@ impl frame_system::Trait for Runtime { type SystemWeightInfo = (); } +parameter_types! { + pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * + BlockWeights::get().max_block; +} + impl pallet_scheduler::Trait for Runtime { type Event = Event; type Origin = Origin; type PalletsOrigin = OriginCaller; type Call = Call; - type MaximumWeight = MaximumBlockWeight; + type MaximumWeight = MaximumSchedulerWeight; type ScheduleOrigin = EnsureRoot; type WeightInfo = (); } @@ -311,7 +311,7 @@ parameter_types! { } parameter_types! { - pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get(); + pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * BlockWeights::get().max_block; } impl pallet_offences::Trait for Runtime { From 80d1523ad91f6c3bcb5e7369a4fbf4a96ccb30ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Tue, 18 Aug 2020 15:31:45 +0200 Subject: [PATCH 10/13] Fix compilation. --- runtime/common/src/lib.rs | 2 +- runtime/polkadot/src/lib.rs | 2 +- runtime/test-runtime/src/lib.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 68f0f6af0908..dea7c288823a 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -29,7 +29,7 @@ pub mod paras_sudo_wrapper; pub mod dummy; use primitives::v1::{BlockNumber, ValidatorId}; -use sp_runtime::{Perquintill, Perbill, FixedPointNumber, traits::Saturating}; +use sp_runtime::{Perquintill, Perbill, FixedPointNumber}; use frame_system::limits; use frame_support::{ parameter_types, traits::{Currency}, diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 43de037b0280..fb3f5dd4a37f 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -21,7 +21,7 @@ #![recursion_limit="256"] use runtime_common::{ - dummy, claims, SlowAdjustingFeeUpdate, + dummy, purchase, claims, SlowAdjustingFeeUpdate, impls::{CurrencyToVoteHandler, ToAuthor}, NegativeImbalance, BlockHashCount, BlockWeights, BlockLength, RocksDbWeight, ParachainSessionKeyPlaceholder, diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index 2f7fe42a205a..422b0359c399 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -27,7 +27,7 @@ use primitives::v1::{ AccountId, AccountIndex, Balance, BlockNumber, Hash as HashT, Nonce, Signature, Moment, }; use runtime_common::{ - attestations, claims, parachains, registrar, slots, SlowAdjustingFeeUpdate, + claims, SlowAdjustingFeeUpdate, impls::CurrencyToVoteHandler, BlockHashCount, BlockWeights, ParachainSessionKeyPlaceholder, }; From a5441ed88fb8fe10d261842208dd3b4e1d34ff74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Wed, 18 Nov 2020 11:33:51 +0100 Subject: [PATCH 11/13] Fixes. --- runtime/common/src/impls.rs | 23 +++++++++-------- runtime/common/src/lib.rs | 12 +++++++++ runtime/common/src/paras_registrar.rs | 19 +++++++------- runtime/kusama/src/lib.rs | 10 +++----- runtime/polkadot/src/lib.rs | 36 +-------------------------- runtime/rococo/src/lib.rs | 4 +-- runtime/test-runtime/src/lib.rs | 4 +-- runtime/westend/src/lib.rs | 5 +--- 8 files changed, 44 insertions(+), 69 deletions(-) diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs index 72d4f6ce895b..a47236389ef8 100644 --- a/runtime/common/src/impls.rs +++ b/runtime/common/src/impls.rs @@ -72,7 +72,8 @@ where #[cfg(test)] mod tests { use super::*; - use frame_support::{impl_outer_origin, parameter_types, weights::Weight}; + use frame_system::limits; + use frame_support::{impl_outer_origin, parameter_types, weights::DispatchClass}; use frame_support::traits::FindAuthor; use sp_core::H256; use sp_runtime::{ @@ -91,9 +92,15 @@ mod tests { parameter_types! { pub const BlockHashCount: u64 = 250; - pub const ExtrinsicBaseWeight: u64 = 100; - pub const MaximumBlockWeight: Weight = 1024; - pub const MaximumBlockLength: u32 = 2 * 1024; + pub BlockWeights: limits::BlockWeights = limits::BlockWeights::builder() + .for_class(DispatchClass::all(), |weight| { + weight.base_extrinsic = 100; + }) + .for_class(DispatchClass::non_mandatory(), |weight| { + weight.max_total = Some(1024); + }) + .build_or_panic(); + pub BlockLength: limits::BlockLength = limits::BlockLength::max(2 * 1024); pub const AvailableBlockRatio: Perbill = Perbill::one(); } @@ -110,13 +117,9 @@ mod tests { type Header = Header; type Event = (); type BlockHashCount = BlockHashCount; - type MaximumBlockWeight = MaximumBlockWeight; + type BlockLength = BlockLength; + type BlockWeights = BlockWeights; type DbWeight = (); - type BlockExecutionWeight = (); - type ExtrinsicBaseWeight = ExtrinsicBaseWeight; - type MaximumExtrinsicWeight = MaximumBlockWeight; - type MaximumBlockLength = MaximumBlockLength; - type AvailableBlockRatio = AvailableBlockRatio; type Version = (); type PalletInfo = (); type AccountData = pallet_balances::AccountData; diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 818c0642c3f6..f4144dd4eeef 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -98,6 +98,18 @@ parameter_types! { .build_or_panic(); } +parameter_types! { + /// A limit for off-chain phragmen unsigned solution submission. + /// + /// We want to keep it as high as possible, but can't risk having it reject, + /// so we always subtract the base block execution weight. + pub OffchainSolutionWeightLimit: Weight = BlockWeights::get() + .get(DispatchClass::Normal) + .max_extrinsic + .expect("Normal extrinsics have weight limit configured by default; qed") + .saturating_sub(BlockExecutionWeight::get()); +} + /// Parameterized slow adjusting fee updated based on /// https://w3f-research.readthedocs.io/en/latest/polkadot/Token%20Economics.html#-2.-slow-adjusting-mechanism pub type SlowAdjustingFeeUpdate = TargetedFeeAdjustment< diff --git a/runtime/common/src/paras_registrar.rs b/runtime/common/src/paras_registrar.rs index 6ecd99aee9fe..271e521c957b 100644 --- a/runtime/common/src/paras_registrar.rs +++ b/runtime/common/src/paras_registrar.rs @@ -260,6 +260,7 @@ mod tests { use primitives::v1::{ Balance, BlockNumber, Header, Signature, }; + use frame_system::limits; use frame_support::{ traits::{Randomness, OnInitialize, OnFinalize}, impl_outer_origin, impl_outer_dispatch, assert_ok, parameter_types, @@ -295,11 +296,13 @@ mod tests { #[derive(Clone, Eq, PartialEq)] pub struct Test; + const NORMAL_RATIO: Perbill = Perbill::from_percent(75); parameter_types! { pub const BlockHashCount: u32 = 250; - pub const MaximumBlockWeight: u32 = 4 * 1024 * 1024; - pub const MaximumBlockLength: u32 = 4 * 1024 * 1024; - pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); + pub BlockWeights: limits::BlockWeights = + limits::BlockWeights::with_sensible_defaults(4 * 1024 * 1024, NORMAL_RATIO); + pub BlockLength: limits::BlockLength = + limits::BlockLength::max_with_normal_ratio(4 * 1024 * 1024, NORMAL_RATIO); } impl frame_system::Trait for Test { @@ -315,13 +318,9 @@ mod tests { type Header = Header; type Event = (); type BlockHashCount = BlockHashCount; - type MaximumBlockWeight = MaximumBlockWeight; type DbWeight = (); - type BlockExecutionWeight = (); - type ExtrinsicBaseWeight = (); - type MaximumExtrinsicWeight = MaximumBlockWeight; - type MaximumBlockLength = MaximumBlockLength; - type AvailableBlockRatio = AvailableBlockRatio; + type BlockWeights = BlockWeights; + type BlockLength = BlockLength; type Version = (); type PalletInfo = (); type AccountData = pallet_balances::AccountData; @@ -412,7 +411,7 @@ mod tests { type UnsignedPriority = StakingUnsignedPriority; type MaxIterations = (); type MinSolutionScoreBump = (); - type OffchainSolutionWeightLimit = MaximumBlockWeight; + type OffchainSolutionWeightLimit = (); type WeightInfo = (); } diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 5c189128505b..4d312a546c9f 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -34,7 +34,7 @@ use primitives::v1::{ use runtime_common::{ claims, SlowAdjustingFeeUpdate, CurrencyToVote, impls::DealWithFees, - BlockHashCount, RocksDbWeight, BlockWeights, BlockLength, + BlockHashCount, RocksDbWeight, BlockWeights, BlockLength, OffchainSolutionWeightLimit, ParachainSessionKeyPlaceholder, }; use sp_runtime::{ @@ -323,9 +323,6 @@ parameter_types! { pub const ElectionLookahead: BlockNumber = EPOCH_DURATION_IN_BLOCKS / 4; pub const MaxIterations: u32 = 10; pub MinSolutionScoreBump: Perbill = Perbill::from_rational_approximation(5u32, 10_000); - pub OffchainSolutionWeightLimit: Weight = MaximumExtrinsicWeight::get() - .saturating_sub(BlockExecutionWeight::get()) - .saturating_sub(ExtrinsicBaseWeight::get()); } type SlashCancelOrigin = EnsureOneOf< @@ -1309,11 +1306,12 @@ mod test_fees { #[test] #[ignore] fn block_cost() { - let raw_fee = WeightToFee::calc(&MaximumBlockWeight::get()); + let max_block_weight = BlockWeights::get().max_block; + let raw_fee = WeightToFee::calc(&max_block_weight); println!( "Full Block weight == {} // WeightToFee(full_block) == {} plank", - MaximumBlockWeight::get(), + max_block_weight, raw_fee.separated_string(), ); } diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 3f90a1314836..2f89648c1c00 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -24,7 +24,7 @@ use pallet_transaction_payment::CurrencyAdapter; use runtime_common::{ claims, SlowAdjustingFeeUpdate, CurrencyToVote, impls::DealWithFees, - BlockHashCount, RocksDbWeight, BlockWeights, BlockLength, + BlockHashCount, RocksDbWeight, BlockWeights, BlockLength, OffchainSolutionWeightLimit, ParachainSessionKeyPlaceholder, }; @@ -330,9 +330,6 @@ parameter_types! { pub const ElectionLookahead: BlockNumber = EPOCH_DURATION_IN_BLOCKS / 16; pub const MaxIterations: u32 = 10; pub MinSolutionScoreBump: Perbill = Perbill::from_rational_approximation(5u32, 10_000); - pub OffchainSolutionWeightLimit: Weight = MaximumExtrinsicWeight::get() - .saturating_sub(BlockExecutionWeight::get()) - .saturating_sub(ExtrinsicBaseWeight::get()); } type SlashCancelOrigin = EnsureOneOf< @@ -894,38 +891,7 @@ impl pallet_proxy::Trait for Runtime { pub struct CustomOnRuntimeUpgrade; impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade { fn on_runtime_upgrade() -> frame_support::weights::Weight { -<<<<<<< HEAD - // Update scheduler origin usage - #[derive(Encode, Decode)] - #[allow(non_camel_case_types)] - pub enum OldOriginCaller { - system(frame_system::Origin), - pallet_collective_Instance1( - pallet_collective::Origin - ), - pallet_collective_Instance2( - pallet_collective::Origin - ), - } - - impl Into for OldOriginCaller { - fn into(self) -> OriginCaller { - match self { - OldOriginCaller::system(o) => OriginCaller::system(o), - OldOriginCaller::pallet_collective_Instance1(o) => - OriginCaller::pallet_collective_Instance1(o), - OldOriginCaller::pallet_collective_Instance2(o) => - OriginCaller::pallet_collective_Instance2(o), - } - } - } - - pallet_scheduler::Module::::migrate_origin::(); - - ::MaximumBlockWeight::get() -======= 0 ->>>>>>> master } } diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index 37a08b3fe2ab..00b7e1a41ce7 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -33,7 +33,7 @@ use primitives::v1::{ use runtime_common::{ SlowAdjustingFeeUpdate, impls::ToAuthor, - BlockHashCount, BlockWeights, BlockLength, RocksDbWeight, + BlockHashCount, BlockWeights, BlockLength, RocksDbWeight, OffchainSolutionWeightLimit, }; use runtime_parachains::{ self, @@ -358,7 +358,7 @@ impl pallet_staking::Trait for Runtime { type Call = Call; type UnsignedPriority = StakingUnsignedPriority; type MaxIterations = MaxIterations; - type OffchainSolutionWeightLimit = MaximumBlockWeight; + type OffchainSolutionWeightLimit = OffchainSolutionWeightLimit; type MinSolutionScoreBump = MinSolutionScoreBump; type WeightInfo = (); } diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index 311d1f7b64cb..6df54fdf659c 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -124,7 +124,7 @@ parameter_types! { impl frame_system::Trait for Runtime { type BaseCallFilter = (); type BlockWeights = BlockWeights; - type BlockLength = (); + type BlockLength = BlockLength; type DbWeight = (); type Origin = Origin; type Call = Call; @@ -325,7 +325,7 @@ impl pallet_staking::Trait for Runtime { type Call = Call; type UnsignedPriority = StakingUnsignedPriority; type MaxIterations = MaxIterations; - type OffchainSolutionWeightLimit = MaximumBlockWeight; + type OffchainSolutionWeightLimit = (); type MinSolutionScoreBump = MinSolutionScoreBump; type WeightInfo = (); diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index a19446b94ceb..6fe045618f4c 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -33,7 +33,7 @@ use primitives::v1::{ use runtime_common::{ SlowAdjustingFeeUpdate, CurrencyToVote, impls::ToAuthor, - BlockHashCount, BlockWeights, BlockLength, RocksDbWeight, + BlockHashCount, BlockWeights, BlockLength, RocksDbWeight, OffchainSolutionWeightLimit, ParachainSessionKeyPlaceholder, }; use sp_runtime::{ @@ -309,9 +309,6 @@ parameter_types! { pub const ElectionLookahead: BlockNumber = EPOCH_DURATION_IN_BLOCKS / 4; pub const MaxIterations: u32 = 10; pub MinSolutionScoreBump: Perbill = Perbill::from_rational_approximation(5u32, 10_000); - pub OffchainSolutionWeightLimit: Weight = MaximumExtrinsicWeight::get() - .saturating_sub(BlockExecutionWeight::get()) - .saturating_sub(ExtrinsicBaseWeight::get()); } impl pallet_staking::Trait for Runtime { From ca889b60b2231fadedd6d06ae7bf2e63b2190888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Thu, 3 Dec 2020 10:47:33 +0100 Subject: [PATCH 12/13] Fix block_weight usage. --- runtime/common/src/purchase.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/common/src/purchase.rs b/runtime/common/src/purchase.rs index b6cdc7a49c50..2efb61ae4aa6 100644 --- a/runtime/common/src/purchase.rs +++ b/runtime/common/src/purchase.rs @@ -382,7 +382,7 @@ pub fn remove_pallet() -> frame_support::weights::Weight remove_storage_prefix(b"Purchase", b"Statement", b""); remove_storage_prefix(b"Purchase", b"UnlockBlock", b""); - T::block_weights().max_block + ::BlockWeights::get().max_block } #[cfg(test)] From 08c9ddcc629dc7921833fc8653d978fe2124bb25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Tue, 8 Dec 2020 13:18:55 +0100 Subject: [PATCH 13/13] Bump substrate. --- Cargo.lock | 272 ++++++++++++++++++++++++++--------------------------- 1 file changed, 136 insertions(+), 136 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c06db85aa94d..d64b5c90309f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1462,7 +1462,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "parity-scale-codec", ] @@ -1470,7 +1470,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-support", "frame-system", @@ -1488,7 +1488,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "chrono", "frame-benchmarking", @@ -1510,7 +1510,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-support", "frame-system", @@ -1526,7 +1526,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "12.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "parity-scale-codec", "serde", @@ -1537,7 +1537,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "bitflags", "frame-metadata", @@ -1562,7 +1562,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.24", @@ -1573,7 +1573,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1585,7 +1585,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", @@ -1595,7 +1595,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-support", "impl-trait-for-tuples 0.1.3", @@ -1611,7 +1611,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-benchmarking", "frame-support", @@ -1625,7 +1625,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "parity-scale-codec", "sp-api", @@ -3798,7 +3798,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b" [[package]] name = "pallet-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-support", "frame-system", @@ -3814,7 +3814,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-support", "frame-system", @@ -3829,7 +3829,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-benchmarking", "frame-support", @@ -3854,7 +3854,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-benchmarking", "frame-support", @@ -3868,7 +3868,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-benchmarking", "frame-support", @@ -3884,7 +3884,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-benchmarking", "frame-support", @@ -3899,7 +3899,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-benchmarking", "frame-support", @@ -3914,7 +3914,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-benchmarking", "frame-support", @@ -3935,7 +3935,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3951,7 +3951,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-benchmarking", "frame-support", @@ -3971,7 +3971,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-benchmarking", "frame-support", @@ -3988,7 +3988,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-support", "frame-system", @@ -4002,7 +4002,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4018,7 +4018,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-support", "frame-system", @@ -4032,7 +4032,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-support", "frame-system", @@ -4047,7 +4047,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4068,7 +4068,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4084,7 +4084,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-support", "frame-system", @@ -4097,7 +4097,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "enumflags2", "frame-support", @@ -4112,7 +4112,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4127,7 +4127,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-support", "frame-system", @@ -4147,7 +4147,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4163,7 +4163,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-support", "frame-system", @@ -4177,7 +4177,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4199,7 +4199,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", @@ -4210,7 +4210,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-support", "frame-system", @@ -4224,7 +4224,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4242,7 +4242,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-support", "frame-system", @@ -4259,7 +4259,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4277,7 +4277,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-support", "parity-scale-codec", @@ -4290,7 +4290,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4305,7 +4305,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4321,7 +4321,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "enumflags2", "frame-benchmarking", @@ -6571,7 +6571,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "async-trait", "derive_more", @@ -6599,7 +6599,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -6622,7 +6622,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6639,7 +6639,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "impl-trait-for-tuples 0.1.3", "parity-scale-codec", @@ -6660,7 +6660,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", @@ -6671,7 +6671,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "atty", "chrono", @@ -6714,7 +6714,7 @@ dependencies = [ [[package]] name = "sc-cli-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", @@ -6725,7 +6725,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "derive_more", "fnv", @@ -6759,7 +6759,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "blake2-rfc", "hash-db", @@ -6789,7 +6789,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "sc-client-api", "sp-blockchain", @@ -6800,7 +6800,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "derive_more", "fork-tree", @@ -6845,7 +6845,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "derive_more", "futures 0.3.8", @@ -6869,7 +6869,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6882,7 +6882,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -6908,7 +6908,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "log", "sc-client-api", @@ -6922,7 +6922,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "derive_more", "lazy_static", @@ -6951,7 +6951,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "derive_more", "parity-scale-codec", @@ -6967,7 +6967,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "log", "parity-scale-codec", @@ -6982,7 +6982,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "log", "parity-scale-codec", @@ -7000,7 +7000,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "derive_more", "finality-grandpa", @@ -7037,7 +7037,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "derive_more", "finality-grandpa", @@ -7061,7 +7061,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "ansi_term 0.12.1", "futures 0.3.8", @@ -7079,7 +7079,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "async-trait", "derive_more", @@ -7099,7 +7099,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "hash-db", "lazy_static", @@ -7118,7 +7118,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "async-std", "async-trait", @@ -7172,7 +7172,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -7187,7 +7187,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "bytes 0.5.6", "fnv", @@ -7214,7 +7214,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "futures 0.3.8", "libp2p", @@ -7227,7 +7227,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7236,7 +7236,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "futures 0.3.8", "hash-db", @@ -7270,7 +7270,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "derive_more", "futures 0.3.8", @@ -7294,7 +7294,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "futures 0.1.29", "jsonrpc-core", @@ -7312,7 +7312,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "directories 3.0.1", "exit-future", @@ -7376,7 +7376,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "log", "parity-scale-codec", @@ -7391,7 +7391,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -7411,7 +7411,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -7432,7 +7432,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "ansi_term 0.12.1", "erased-serde", @@ -7456,7 +7456,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "derive_more", "futures 0.3.8", @@ -7478,7 +7478,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "futures 0.3.8", "futures-diagnose", @@ -7933,7 +7933,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "log", "sp-core", @@ -7945,7 +7945,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "hash-db", "parity-scale-codec", @@ -7961,7 +7961,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -7973,7 +7973,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "parity-scale-codec", "serde", @@ -7985,7 +7985,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -7998,7 +7998,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "parity-scale-codec", "sp-api", @@ -8010,7 +8010,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -8021,7 +8021,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "parity-scale-codec", "sp-api", @@ -8033,7 +8033,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "futures 0.3.8", "log", @@ -8051,7 +8051,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "serde", "serde_json", @@ -8060,7 +8060,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -8086,7 +8086,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "merlin", "parity-scale-codec", @@ -8106,7 +8106,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -8115,7 +8115,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -8127,7 +8127,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "base58", "blake2-rfc", @@ -8171,7 +8171,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -8180,7 +8180,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", @@ -8190,7 +8190,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "environmental", "parity-scale-codec", @@ -8201,7 +8201,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "finality-grandpa", "log", @@ -8218,7 +8218,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "parity-scale-codec", "parking_lot 0.10.2", @@ -8230,7 +8230,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "futures 0.3.8", "hash-db", @@ -8254,7 +8254,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "lazy_static", "sp-core", @@ -8265,7 +8265,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "async-trait", "derive_more", @@ -8281,7 +8281,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "parity-scale-codec", "serde", @@ -8293,7 +8293,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", @@ -8304,7 +8304,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "sp-api", "sp-core", @@ -8314,7 +8314,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "backtrace", ] @@ -8322,7 +8322,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "serde", "sp-core", @@ -8331,7 +8331,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "either", "hash256-std-hasher", @@ -8352,7 +8352,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "impl-trait-for-tuples 0.1.3", "parity-scale-codec", @@ -8369,7 +8369,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "Inflector", "proc-macro-crate", @@ -8381,7 +8381,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "serde", "serde_json", @@ -8390,7 +8390,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "parity-scale-codec", "sp-api", @@ -8403,7 +8403,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -8413,7 +8413,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "hash-db", "log", @@ -8435,12 +8435,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" [[package]] name = "sp-storage" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8453,7 +8453,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "log", "sp-core", @@ -8466,7 +8466,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "impl-trait-for-tuples 0.1.3", "parity-scale-codec", @@ -8480,7 +8480,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "log", "parity-scale-codec", @@ -8493,7 +8493,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "derive_more", "futures 0.3.8", @@ -8509,7 +8509,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "hash-db", "memory-db", @@ -8523,7 +8523,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "futures 0.3.8", "futures-core", @@ -8535,7 +8535,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8547,7 +8547,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "impl-trait-for-tuples 0.1.3", "parity-scale-codec", @@ -8689,7 +8689,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "chrono", "console_error_panic_hook", @@ -8715,7 +8715,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "platforms", ] @@ -8723,7 +8723,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.8", @@ -8746,7 +8746,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "async-std", "derive_more", @@ -8760,7 +8760,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "futures 0.1.29", "futures 0.3.8", @@ -8787,7 +8787,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "futures 0.3.8", "substrate-test-utils-derive", @@ -8797,7 +8797,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eaab146094360ca02538f5287abe859b2d815c3c" +source = "git+https://github.com/paritytech/substrate#332399d16668a6c769f1a7db154bb9ea3b50e61c" dependencies = [ "proc-macro-crate", "quote 1.0.7",