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

Burnin PR for polkadot/pull/1740 - Substrate PR (#7000) #1746

Closed
rakanalh wants to merge 34 commits into from
Closed

Burnin PR for polkadot/pull/1740 - Substrate PR (#7000) #1746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
605bed8
Fix keystore types
Sep 9, 2020
55f59c3
Merge remote-tracking branch 'upstream/master' into keystore-fixes
Sep 21, 2020
e60ba32
Use SyncCryptoStorePtr
Sep 21, 2020
7a49293
Borrow keystore
Sep 21, 2020
1072116
Fix unused imports
Sep 21, 2020
c86f635
Merge remote-tracking branch 'upstream/master' into keystore-fixes
Sep 21, 2020
6fc0496
Fix polkadot service
Sep 21, 2020
950860e
Fix bitfield-distribution tests
Sep 21, 2020
95b9c82
Merge remote-tracking branch 'upstream/master' into keystore-fixes
Sep 21, 2020
5c16b3b
Fix indentation
Sep 21, 2020
b6a15e5
Fix backing tests
Sep 22, 2020
8aed67d
Fix tests
Sep 22, 2020
2a932af
Fix provisioner tests
Sep 22, 2020
75e54e6
Merge remote-tracking branch 'upstream/master' into keystore-fixes
Sep 22, 2020
4812ec7
Merge remote-tracking branch 'upstream/master' into keystore-fixes
Sep 22, 2020
59866d2
Removed SyncCryptoStorePtr
Sep 23, 2020
0ddfa8c
Fix services
Sep 23, 2020
f3882b4
Address PR feedback
Sep 23, 2020
0c6b725
Point cargo.toml to my branch
Sep 23, 2020
40c04fd
Update cargo.lock
Sep 23, 2020
644af04
Address PR feedback - 2
Sep 23, 2020
b180b62
Merge remote-tracking branch 'upstream/master' into keystore-fixes
Sep 24, 2020
6094a36
Merge remote-tracking branch 'upstream/master' into keystore-fixes
Sep 28, 2020
bc26850
Update CryptoStorePtr imports to be from sp_keystore
Sep 28, 2020
a27f7c1
Typo
Sep 28, 2020
8028961
Fix CryptoStore import
Sep 28, 2020
31902eb
Merge branch 'keystore-fixes' into rakan-async-keystore-burnin
Sep 28, 2020
08eb205
Document the reason behind using filesystem keystore
Sep 28, 2020
34768ca
Remove VALIDATORS
Sep 28, 2020
23d4845
Merge remote-tracking branch 'upstream/master' into keystore-fixes
Oct 1, 2020
14d683a
Fix duplicate dependency
Oct 1, 2020
90348cc
Merge branch 'keystore-fixes' into rakan-async-keystore-burnin
Oct 1, 2020
9aeda15
Merge remote-tracking branch 'upstream/master' into keystore-fixes
Oct 2, 2020
77bd7ef
Merge branch 'keystore-fixes' into rakan-async-keystore-burnin
Oct 2, 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,452 changes: 859 additions & 593 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,30 @@ 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" }
sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery" }
sp-core = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery" }
sp-runtime = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery" }
sc-client-api = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery" }
sc-client-db = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery" }
sc-executor = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery" }
sc-tracing = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery" }
service = { package = "polkadot-service", path = "../service", default-features = false, optional = true }
service-new = { package = "polkadot-service-new", path = "../node/service", default-features = false, optional = true }

tokio = { version = "0.2.13", features = ["rt-threaded"], optional = true }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
frame-benchmarking-cli = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery", optional = true }
sc-cli = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery", optional = true }
sc-service = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery", 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/rakanalh/substrate", branch = "async-keystore-auth-discovery", 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 = "master", default-features = false }
sp-trie = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery", default-features = false }

[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-build-script-utils = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery" }

[features]
default = [ "wasmtime", "db", "cli", "service-old", "trie-memory-tracker" ]
Expand Down
6 changes: 3 additions & 3 deletions core-primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ authors = ["Parity Technologies <[email protected]>"]
edition = "2018"

[dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-core = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery", default-features = false }
sp-std = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery", default-features = false }
sp-runtime = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery", 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
Open in desktop
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 = "master" }
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery" }
trie = { package = "sp-trie", git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery" }
derive_more = "0.15.0"
2 changes: 1 addition & 1 deletion node/collation-generation/Cargo.toml
View file
Open in desktop
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 = "master" }
sp-core = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery" }

[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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsys
polkadot-node-subsystem-util = { path = "../../subsystem-util" }

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

[dependencies]
futures = "0.3.5"
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery" }
sp-api = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery" }
sp-keystore = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery" }
sc-client-api = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery" }
sp-blockchain = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery" }
keystore = { package = "sc-keystore", git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery" }
polkadot-primitives = { path = "../../../primitives" }
polkadot-node-primitives = { path = "../../primitives" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
Expand All @@ -21,8 +23,9 @@ 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 = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-application-crypto = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery" }
sp-keyring = { git = "https://github.com/rakanalh/substrate", branch = "async-keystore-auth-discovery" }
futures = { version = "0.3.5", features = ["thread-pool"] }
tokio = "0.2.22"
assert_matches = "1.3.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
Loading