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

Companion PR for #4954 #1080

Closed
wants to merge 27 commits into from
Closed
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
1ea9296
companion PR for paritytech/substrate#4945
seunlanlege May 8, 2020
106e9ad
bump spec_version
seunlanlege May 8, 2020
15fe5ed
Merge branch 'master' of github.com:paritytech/polkadot into seun-sc-…
seunlanlege May 11, 2020
82f3eb5
newer commit
seunlanlege May 11, 2020
0ac22ba
Merge branch 'master' of github.com:paritytech/polkadot into seun-sc-…
seunlanlege May 12, 2020
176b3a6
bump Cargo.lock
seunlanlege May 19, 2020
3f5e582
Merge branch 'master' of github.com:paritytech/polkadot into seun-sc-…
seunlanlege May 19, 2020
f8fffa1
Merge branch 'master' of github.com:paritytech/polkadot into seun-sc-…
seunlanlege May 21, 2020
4f398e4
Merge branch 'master' of github.com:paritytech/polkadot into seun-sc-…
seunlanlege May 25, 2020
a85ec5d
switch branch to master
seunlanlege May 29, 2020
b3e564b
Merge branch 'master' of github.com:paritytech/polkadot into seun-sc-…
seunlanlege May 29, 2020
3a6d215
switch branch from master
seunlanlege May 29, 2020
882a54f
bump runtime spec_versions
seunlanlege May 29, 2020
c1b5582
Merge branch 'master' of github.com:paritytech/polkadot into seun-sc-…
seunlanlege May 29, 2020
afed728
manually construct signed extras
seunlanlege Jun 2, 2020
51b5942
Merge branch 'master' of github.com:paritytech/polkadot into seun-sc-…
seunlanlege Jun 2, 2020
e8387cb
rename some vars
seunlanlege Jun 2, 2020
85d9e34
merged with master
seunlanlege Jun 8, 2020
478c48f
???
seunlanlege Jun 8, 2020
ca133dc
Merge branch 'master' of github.com:paritytech/polkadot into seun-sc-…
seunlanlege Jun 8, 2020
a2a6b46
nah doesn't work for my branch
seunlanlege Jun 8, 2020
70a288a
Merge branch 'master' of github.com:paritytech/polkadot into seun-sc-…
seunlanlege Jun 8, 2020
5c7df4d
Merge branch 'master' of github.com:paritytech/polkadot into seun-sc-…
seunlanlege Jun 18, 2020
e07494a
Merge branch 'master' of github.com:paritytech/polkadot into seun-sc-…
seunlanlege Jun 19, 2020
532fe19
Merge branch 'master' of github.com:paritytech/polkadot into seun-sc-…
seunlanlege Jun 22, 2020
5ee5bd8
revert to master
seunlanlege Aug 20, 2020
ae5b7a3
Merge branch 'master' of github.com:paritytech/polkadot into seun-sc-…
seunlanlege Aug 20, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,035 changes: 789 additions & 246 deletions Cargo.lock

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions availability-store/Cargo.toml
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.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 = "seun-sc-cli-subkey" }
Copy link
Contributor

@rakanalh rakanalh May 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

branch should always be "master" is what @gavofyork meant.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah thanks for this 🙏

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" }
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" }
kvdb = "0.6.0"
kvdb-memorydb = "0.6.0"

Expand Down
22 changes: 11 additions & 11 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,25 @@ 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 = "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" }
service = { package = "polkadot-service", path = "../service", default-features = false }

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 = "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 }

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 = "seun-sc-cli-subkey", 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 = "seun-sc-cli-subkey" }

[features]
default = [ "wasmtime", "db", "cli" ]
Expand Down
22 changes: 11 additions & 11 deletions collator/Cargo.toml
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 = "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 = "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" }
polkadot-primitives = { path = "../primitives" }
polkadot-cli = { path = "../cli" }
polkadot-network = { path = "../network" }
Expand All @@ -28,4 +28,4 @@ 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 = "seun-sc-cli-subkey" }
4 changes: 2 additions & 2 deletions erasure-coding/Cargo.toml
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.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 = "seun-sc-cli-subkey" }
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
derive_more = "0.15.0"
16 changes: 8 additions & 8 deletions network/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ 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 = "seun-sc-cli-subkey" }
sc-network-gossip = { 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" }
futures = "0.3.4"
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 = "seun-sc-cli-subkey" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
wasm-timer = "0.2.4"

[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 = "seun-sc-cli-subkey" }
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
20 changes: 10 additions & 10 deletions network/test/Cargo.toml
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 = "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 = "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" }
polkadot-test-runtime-client = { path = "../../runtime/test-runtime/client" }
14 changes: 7 additions & 7 deletions parachain/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "seun-sc-cli-subkey", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", default-features = false }
sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", 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-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true, default-features = false }
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-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", optional = true, default-features = false }
sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", optional = true }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", optional = true }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", optional = true }
parking_lot = { version = "0.10.0", optional = true }
log = { version = "0.4.8", optional = true }

Expand Down
2 changes: 1 addition & 1 deletion parachain/test-parachains/adder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "master", default-features = false, features = [ "disable_allocator" ] }
runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", default-features = false, features = [ "disable_allocator" ] }

[build-dependencies]
wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.6" }
Expand Down
4 changes: 2 additions & 2 deletions parachain/test-parachains/adder/collator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "seun-sc-cli-subkey" }
client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey" }
parking_lot = "0.10.0"
codec = { package = "parity-scale-codec", version = "1.2.0" }
futures = "0.3.4"
2 changes: 1 addition & 1 deletion parachain/test-parachains/code-upgrader/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "master", default-features = false, features = [ "disable_allocator" ] }
runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", default-features = false, features = [ "disable_allocator" ] }

[build-dependencies]
wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.6" }
Expand Down
22 changes: 11 additions & 11 deletions primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ 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 }
system = { package = "frame-system", 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 = "seun-sc-cli-subkey", default-features = false }
system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", default-features = false }
inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", default-features = false }
application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", default-features = false }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", default-features = false }
sp-version = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", default-features = false }
sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", default-features = false }
sp-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", default-features = false }
runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "seun-sc-cli-subkey", default-features = false }
polkadot-parachain = { path = "../parachain", 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 = "seun-sc-cli-subkey", default-features = false }
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }

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

[features]
Expand Down
Loading