Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
21bd35d
Update polkadot
pepyakin Feb 2, 2021
1606eab
Migrate all uses of MQC heads to merkle proofs
pepyakin Jan 29, 2021
ca992ed
Mass rename `relay_parent_storage_root`
pepyakin Feb 2, 2021
9e0724a
Restore parachain-system tests
pepyakin Feb 3, 2021
4a179c2
Update polkadot and libp2p swarm for testing
pepyakin Feb 5, 2021
94fad6c
Collapse match into an if let
pepyakin Feb 8, 2021
a4c1e72
Merge remote-tracking branch 'origin/ser-clean-pvd' into bkchr-aura-t…
bkchr Feb 8, 2021
d6c5060
Start with something
bkchr Feb 8, 2021
d1d06f0
Merge remote-tracking branch 'origin/master' into bkchr-aura-the-long…
bkchr Feb 16, 2021
cf17fbd
Update Substrate & Polkadot
bkchr Feb 16, 2021
17916d8
Merge branch 'bkchr-update-substrate-and-poladkot2132434we' into bkch…
bkchr Feb 16, 2021
677dc54
Start to make it compile
bkchr Feb 16, 2021
007dfce
Make it compile
bkchr Feb 17, 2021
a8b4652
Begin with something
bkchr Feb 18, 2021
0fc1f08
Yep
bkchr Feb 19, 2021
c4d80d6
I'm a hacker
bkchr Feb 19, 2021
d56c303
Bring back the builder
bkchr Feb 19, 2021
4733bb2
Make it work in some way
bkchr Feb 19, 2021
e27ea7f
Merge remote-tracking branch 'origin/master' into bkchr-aura-the-long…
bkchr Feb 27, 2021
26ab50d
Compile
bkchr Mar 1, 2021
440a513
Parachains use their own "slot"
bkchr Mar 1, 2021
f6d891f
Adds cumulus-pallet-aura
bkchr Mar 1, 2021
f734351
Wrap AuRa import queue to disable equivocation checking by default
bkchr Mar 2, 2021
8c1f788
Pass slot duration
bkchr Mar 2, 2021
e670750
Merge remote-tracking branch 'origin/master' into bkchr-aura-the-long…
bkchr Mar 4, 2021
c876cf9
Check the seal when validating a block
bkchr Mar 4, 2021
ad8e06e
Adds missing file
bkchr Mar 4, 2021
a5b385c
Try to make the seal working
bkchr Mar 4, 2021
b3452b9
Fix it
bkchr Mar 5, 2021
edd65c4
Merge remote-tracking branch 'origin/master' into bkchr-aura-the-long…
bkchr Mar 16, 2021
e3d3607
Some fixes
bkchr Mar 16, 2021
2a3f53c
Merge remote-tracking branch 'origin/master' into bkchr-aura-the-long…
bkchr Mar 16, 2021
b65c69b
Bring in the latest features to cleanup the code
bkchr Mar 16, 2021
c3fce33
Update and make it compile
bkchr Mar 17, 2021
7a1dc09
Improve the import
bkchr Mar 17, 2021
0438a9c
Merge remote-tracking branch 'origin/master' into bkchr-aura-the-long…
bkchr May 4, 2021
9064c08
Start fixing
bkchr May 4, 2021
a651bd3
Merge remote-tracking branch 'origin/master' into bkchr-aura-the-long…
bkchr May 4, 2021
2d64c7c
More work
bkchr May 6, 2021
c8bbc6f
Fix fix fix
bkchr May 6, 2021
de10387
Make everything compile
bkchr May 6, 2021
9619b67
Merge remote-tracking branch 'origin/master' into bkchr-aura-the-long…
bkchr May 6, 2021
d14e281
Small cleanups
bkchr May 7, 2021
d78e910
Rename and more docs
bkchr May 8, 2021
033b657
Docs
bkchr May 8, 2021
b4a4790
Fixes fixes fixes
bkchr May 8, 2021
1b94f39
Update rococo-parachains/src/chain_spec.rs
bkchr May 8, 2021
fe62ccc
Update client/consensus/aura/src/lib.rs
bkchr May 10, 2021
2c0072b
Update client/consensus/aura/src/lib.rs
bkchr May 10, 2021
fe48de7
Update primitives/parachain-inherent/Cargo.toml
bkchr May 10, 2021
548d69a
Update primitives/parachain-inherent/Cargo.toml
bkchr May 10, 2021
911dc06
Update primitives/parachain-inherent/Cargo.toml
bkchr May 10, 2021
35ec124
Update primitives/parachain-inherent/Cargo.toml
bkchr May 10, 2021
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
Prev Previous commit
Next Next commit
Start fixing
  • Loading branch information
bkchr committed May 4, 2021
commit 9064c0830fa4d160811513b51f4cb8b24e8a3102
475 changes: 264 additions & 211 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions client/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ edition = "2018"
structopt = "0.3.3"

# Substrate dependencies
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
30 changes: 15 additions & 15 deletions client/collator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ edition = "2018"

[dependencies]
# Substrate dependencies
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Polkadot dependencies
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-inherent-something-future" }
polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-inherent-something-future" }
polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-inherent-something-future" }
polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-inherent-something-future" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "master" }

# Cumulus dependencies
cumulus-client-network = { path = "../network" }
Expand All @@ -32,17 +32,17 @@ tracing = "0.1.25"

[dev-dependencies]
# Polkadot dependencies
polkadot-node-subsystem-test-helpers = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-inherent-something-future" }
polkadot-node-subsystem-test-helpers = { git = "https://github.com/paritytech/polkadot", branch = "master" }

# Cumulus dependencies
cumulus-test-runtime = { path = "../../test/runtime" }
cumulus-test-client = { path = "../../test/client" }

# Substrate dependencies
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Other dependencies
env_logger = "0.7.1"
Expand Down
32 changes: 16 additions & 16 deletions client/consensus/aura/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@ edition = "2018"

[dependencies]
# Substrate dependencies
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Polkadot dependencies
polkadot-service = { git = "https://github.com/paritytech/polkadot", features = [ "real-overseer" ] , branch = "bkchr-inherent-something-future" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }

# Cumulus dependencies
cumulus-client-consensus-common = { path = "../common" }
Expand Down
26 changes: 13 additions & 13 deletions client/consensus/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ edition = "2018"

[dependencies]
# Substrate deps
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-block-builder = { 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-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Polkadot deps
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-inherent-something-future" }
polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-inherent-something-future" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "master" }

# Other deps
futures = { version = "0.3.8", features = ["compat"] }
Expand All @@ -32,7 +32,7 @@ dyn-clone = "1.0.4"

[dev-dependencies]
# Substrate deps
sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Cumulus dependencies
cumulus-test-runtime = { path = "../../../test/runtime" }
Expand Down
18 changes: 9 additions & 9 deletions client/consensus/relay-chain/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ edition = "2018"

[dependencies]
# Substrate deps
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Polkadot dependencies
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
Expand Down
38 changes: 19 additions & 19 deletions client/network/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ edition = "2018"

[dependencies]
# Substrate deps
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Polkadot deps
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-inherent-something-future" }
polkadot-statement-table = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-inherent-something-future" }
polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-inherent-something-future" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-inherent-something-future" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-inherent-something-future" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-statement-table = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" }

# other deps
codec = { package = "parity-scale-codec", version = "2.0.0", features = [ "derive" ] }
Expand All @@ -40,11 +40,11 @@ cumulus-primitives-core = { path = "../../primitives/core" }
polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }

# substrate deps
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
24 changes: 12 additions & 12 deletions client/service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ cumulus-client-collator = { path = "../collator" }
cumulus-primitives-core = { path = "../../primitives/core" }

# Substrate dependencies
sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "bkchr-inherent-something-future" }
sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Polkadot dependencies
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-inherent-something-future" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-inherent-something-future" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }

# Other deps
futures = "0.3.6"
Expand Down
Loading