Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Commit

Permalink
merged with master
Browse files Browse the repository at this point in the history
  • Loading branch information
@seunlanlege
seunlanlege committed Aug 20, 2020
1 parent f85bb69 commit 3c350eb
Show file tree
Hide file tree
Showing 52 changed files with 1,090 additions and 1,102 deletions.
1,043 changes: 517 additions & 526 deletions Cargo.lock
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions availability-store/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.4", features = ["derive"] }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", version = "2.0.0-rc5" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
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", version = "2.0.0-rc5" }
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"

Expand Down
24 changes: 12 additions & 12 deletions cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,29 @@ 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 = "seun-sc-cli-subkey" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
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 = "seun-sc-cli-subkey", optional = true }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", optional = true }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", 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 = "seun-sc-cli-subkey", optional = true }
browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
# this crate is used only to enable `trie-memory-tracker` feature
# see https://github.com/paritytech/substrate/pull/6745
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", default-features = false }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }

[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }

[features]
default = [ "wasmtime", "db", "cli", "service-old", "trie-memory-tracker" ]
Expand Down
22 changes: 11 additions & 11 deletions collator/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ edition = "2018"

[dependencies]
futures = "0.3.4"
sc-service = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
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" }
Expand All @@ -29,7 +29,7 @@ futures-timer = "2.0"
codec = { package = "parity-scale-codec", version = "1.3.4" }

[dev-dependencies]
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }

[features]
default = ["service-old"]
Expand Down
6 changes: 3 additions & 3 deletions core-primitives/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"

[dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", 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.4", default-features = false, features = [ "derive" ] }

[features]
Expand Down
4 changes: 2 additions & 2 deletions erasure-coding/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.4", default-features = false, features = ["derive"] }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
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"
18 changes: 9 additions & 9 deletions network/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@ polkadot-validation = { path = "../validation" }
polkadot-primitives = { path = "../primitives" }
polkadot-erasure-coding = { path = "../erasure-coding" }
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network-gossip = { 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-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 = "seun-sc-cli-subkey" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
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 = "seun-sc-cli-subkey" }
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }
20 changes: 10 additions & 10 deletions network/test/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "seun-sc-cli-subkey" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sc-service = { git = "https://github.com/paritytech/substrate", features = ["test-helpers"], branch = "seun-sc-cli-subkey" }
sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
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" }
2 changes: 1 addition & 1 deletion node/collation-generation/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ polkadot-node-primitives = { path = "../primitives" }
polkadot-node-subsystem = { path = "../subsystem" }
polkadot-node-subsystem-util = { path = "../subsystem-util" }
polkadot-primitives = { path = "../../primitives" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }

[dev-dependencies]
polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" }
2 changes: 1 addition & 1 deletion node/core/av-store/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ log = "0.4.8"
derive_more = "0.99.9"

[dev-dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
futures = { version = "0.3.5", features = ["thread-pool"] }
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
kvdb-memorydb = "0.7.0"
Expand Down
12 changes: 6 additions & 6 deletions node/core/backing/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ edition = "2018"

[dependencies]
futures = "0.3.5"
sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
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" }
polkadot-primitives = { path = "../../../primitives" }
polkadot-node-primitives = { path = "../../primitives" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
Expand All @@ -21,8 +21,8 @@ bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
log = "0.4.8"

[dev-dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
futures = { version = "0.3.5", features = ["thread-pool"] }
assert_matches = "1.3.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
2 changes: 1 addition & 1 deletion node/core/bitfield-signing/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ log = "0.4.8"
polkadot-primitives = { path = "../../../primitives" }
polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "master" }
wasm-timer = "0.2.4"
6 changes: 3 additions & 3 deletions node/core/candidate-validation/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ edition = "2018"

[dependencies]
futures = "0.3.5"
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" }
parity-scale-codec = { version = "1.3.0", default-features = false, features = ["bit-vec", "derive"] }

polkadot-primitives = { path = "../../../primitives" }
Expand All @@ -18,7 +18,7 @@ derive_more = "0.99.9"
log = "0.4.8"

[dev-dependencies]
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
futures = { version = "0.3.5", features = ["thread-pool"] }
assert_matches = "1.3.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
4 changes: 2 additions & 2 deletions node/core/chain-api/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ edition = "2018"

[dependencies]
futures = { version = "0.3.5" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-primitives = { path = "../../../primitives" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }

[dev-dependencies]
futures = { version = "0.3.5", features = ["thread-pool"] }
maplit = "1.0.2"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
Loading

0 comments on commit 3c350eb

Please sign in to comment.