From b1f88ed21ec551c35ff2c2d776b214f2383a56d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 24 Feb 2020 17:48:10 +0100 Subject: [PATCH] Update branches --- availability-store/Cargo.toml | 18 ++--- cli/Cargo.toml | 18 ++--- collator/Cargo.toml | 20 ++--- erasure-coding/Cargo.toml | 4 +- network/Cargo.toml | 18 ++--- parachain/Cargo.toml | 12 +-- primitives/Cargo.toml | 20 ++--- rpc/Cargo.toml | 14 ++-- runtime/common/Cargo.toml | 42 +++++----- runtime/kusama/Cargo.toml | 94 +++++++++++------------ runtime/polkadot/Cargo.toml | 88 ++++++++++----------- service/Cargo.toml | 64 +++++++-------- statement-table/Cargo.toml | 2 +- test-parachains/adder/Cargo.toml | 2 +- test-parachains/adder/collator/Cargo.toml | 6 +- validation/Cargo.toml | 32 ++++---- 16 files changed, 227 insertions(+), 227 deletions(-) diff --git a/availability-store/Cargo.toml b/availability-store/Cargo.toml index 470c241f43ac..c492b9337d1e 100644 --- a/availability-store/Cargo.toml +++ b/availability-store/Cargo.toml @@ -15,15 +15,15 @@ futures = "0.3.4" tokio = { version = "0.2.10", features = ["rt-core"] } exit-future = "0.2.0" codec = { package = "parity-scale-codec", version = "1.1.0", features = ["derive"] } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sc-client = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-client = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } kvdb = "0.3.1" kvdb-memorydb = "0.3.1" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 5bb77558a3cc..2e8f5cdfb058 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -12,21 +12,21 @@ crate-type = ["cdylib", "rlib"] log = "0.4.8" futures = { version = "0.3.4", features = ["compat"] } structopt = "0.3.8" -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", optional = true } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sc-client = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", optional = true } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-client = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } service = { package = "polkadot-service", path = "../service", default-features = false } tokio = { version = "0.2.10", features = ["rt-threaded"], optional = true } wasm-bindgen = { version = "0.2.57", optional = true } wasm-bindgen-futures = { version = "0.4.7", optional = true } -browser-utils = { package = "browser-utils", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", optional = true } +browser-utils = { package = "browser-utils", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", optional = true } [features] default = [ "wasmtime", "rocksdb", "cli" ] diff --git a/collator/Cargo.toml b/collator/Cargo.toml index f873d1acb042..e584ca6ff8ce 100644 --- a/collator/Cargo.toml +++ b/collator/Cargo.toml @@ -7,15 +7,15 @@ edition = "2018" [dependencies] futures = "0.3.4" -sc-client = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } +sc-client = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } polkadot-primitives = { path = "../primitives" } polkadot-cli = { path = "../cli" } polkadot-network = { path = "../network" } @@ -27,4 +27,4 @@ futures-timer = "2.0" codec = { package = "parity-scale-codec", version = "1.1.0" } [dev-dependencies] -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml index 447742432945..4ca9508e2483 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", git = "https://github.com/paritytech/reed-solomon-erasure" } codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } derive_more = "0.15.0" diff --git a/network/Cargo.toml b/network/Cargo.toml index a1db3a9a914b..451dd1aafe2f 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.1.0", default-features = false, features = ["derive"] } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } futures = "0.3.4" log = "0.4.8" exit-future = "0.2.0" futures-timer = "2.0" -sc-client = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } +sc-client = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } wasm-timer = "0.2.4" [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml index 1c729f1ac60a..85948c302244 100644 --- a/parachain/Cargo.toml +++ b/parachain/Cargo.toml @@ -9,12 +9,12 @@ edition = "2018" codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = [ "derive" ] } derive_more = { version = "0.99.2", optional = true } serde = { version = "1.0.102", default-features = false, features = [ "derive" ], optional = true } -rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", optional = true } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", optional = true } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", optional = true } +rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", optional = true } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", optional = true } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", optional = true } lazy_static = { version = "1.4.0", optional = true } parking_lot = { version = "0.10.0", optional = true } log = { version = "0.4.8", optional = true } diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 08a07155f38c..98861c5afc0b 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -7,20 +7,20 @@ edition = "2018" [dependencies] serde = { version = "1.0.102", optional = true, features = ["derive"] } parity-scale-codec = { version = "1.1.0", default-features = false, features = ["bit-vec", "derive"] } -primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } +primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } polkadot-parachain = { path = "../parachain", default-features = false } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } bitvec = { version = "0.15.2", default-features = false, features = ["alloc"] } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } [dev-dependencies] -sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } +sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } pretty_assertions = "0.5.1" [features] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 4890f3051c12..6353dd77fb04 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -5,13 +5,13 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -client = { package = "sc-client", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } +client = { package = "sc-client", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } jsonrpc-core = "14.0.3" polkadot-primitives = { path = "../primitives" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 3eec6775f21c..fbac238062c0 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -12,22 +12,22 @@ 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 = "bkchr-cumulus-branch-dev", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } polkadot-parachain = { path = "../../parachain", default-features = false } @@ -36,12 +36,12 @@ 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 = "bkchr-cumulus-branch-dev" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } trie-db = "0.20.0" serde_json = "1.0.41" diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index a314e8a19524..cb84be8dd684 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -13,52 +13,52 @@ 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 } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } -authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false, features = ["migrate-authorities"] } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false, features = ["migrate-authorities"] } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -68,8 +68,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 = "bkchr-cumulus-branch-dev" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } trie-db = "0.20.0" serde_json = "1.0.41" diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml index 2461b255935a..b4cd36d95773 100644 --- a/runtime/polkadot/Cargo.toml +++ b/runtime/polkadot/Cargo.toml @@ -13,49 +13,49 @@ 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 } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } -authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false, features = ["migrate-authorities"] } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false, features = ["migrate-authorities"] } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -65,8 +65,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 = "bkchr-cumulus-branch-dev" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } trie-db = "0.20.0" serde_json = "1.0.41" diff --git a/service/Cargo.toml b/service/Cargo.toml index be3942e98a3f..be3e3a057486 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -19,39 +19,39 @@ polkadot-runtime = { path = "../runtime/polkadot" } kusama-runtime = { path = "../runtime/kusama" } polkadot-network = { path = "../network" } polkadot-rpc = { path = "../rpc" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sc-client = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev", default-features = false } -telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-client = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } codec = { package = "parity-scale-codec", version = "1.1.0" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } [features] default = ["rocksdb"] diff --git a/statement-table/Cargo.toml b/statement-table/Cargo.toml index f5fe02486b5f..12461a669d5a 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.1.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } primitives = { package = "polkadot-primitives", path = "../primitives" } diff --git a/test-parachains/adder/Cargo.toml b/test-parachains/adder/Cargo.toml index f16085599cf5..4eedea52b1a2 100644 --- a/test-parachains/adder/Cargo.toml +++ b/test-parachains/adder/Cargo.toml @@ -13,7 +13,7 @@ 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 = "bkchr-cumulus-branch-dev", default-features = false, features = [ "disable_allocator" ] } +runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false, features = [ "disable_allocator" ] } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.5" } diff --git a/test-parachains/adder/collator/Cargo.toml b/test-parachains/adder/collator/Cargo.toml index d152d1db8962..5c891f1be821 100644 --- a/test-parachains/adder/collator/Cargo.toml +++ b/test-parachains/adder/collator/Cargo.toml @@ -9,9 +9,9 @@ adder = { path = ".." } parachain = { package = "polkadot-parachain", path = "../../../parachain" } collator = { package = "polkadot-collator", path = "../../../collator" } primitives = { package = "polkadot-primitives", path = "../../../primitives" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -client = { package = "sc-client", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +client = { package = "sc-client", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } parking_lot = "0.10.0" codec = { package = "parity-scale-codec", version = "1.1.0" } futures = "0.3.4" diff --git a/validation/Cargo.toml b/validation/Cargo.toml index 98044acc4d57..1a4c2eecf96f 100644 --- a/validation/Cargo.toml +++ b/validation/Cargo.toml @@ -18,22 +18,22 @@ 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 = "bkchr-cumulus-branch-dev" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -consensus = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -block-builder = { package = "sc-block-builder", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +consensus = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +block-builder = { package = "sc-block-builder", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } bitvec = { version = "0.15.2", default-features = false, features = ["alloc"] } -runtime_babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } -keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } +runtime_babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch-dev" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }