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

Update Cumulus for Parachains V1 #224

Merged
bkchr merged 30 commits into from
Nov 8, 2020
Merged

Update Cumulus for Parachains V1 #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
571b41f
Start with something
bkchr Sep 10, 2020
c0b3e3c
Whatever
bkchr Sep 29, 2020
8046e35
Update
bkchr Oct 1, 2020
aa536c3
MOARE
bkchr Oct 1, 2020
0afdb49
Make cumulus-network compile and tests work
bkchr Oct 2, 2020
978074d
Update more and fixes
bkchr Oct 5, 2020
333c981
More stuff
bkchr Oct 5, 2020
3fa6593
More fixes
bkchr Oct 6, 2020
fe36f96
Make collator build
bkchr Oct 6, 2020
93daaf0
Make test almost work
bkchr Oct 7, 2020
67a1a9d
Remove contracts runtime
bkchr Oct 8, 2020
b8610e0
More test work
bkchr Oct 8, 2020
ec7257a
Merge remote-tracking branch 'origin/master' into bkchr-parachains-v1
bkchr Oct 8, 2020
ba58878
Make service compile
bkchr Oct 11, 2020
4a1dfe3
Fix test-service
bkchr Oct 12, 2020
05b50b8
Fix test client
bkchr Oct 12, 2020
eee6ea5
More fixes
bkchr Oct 12, 2020
e102b04
Fix collator test
bkchr Oct 13, 2020
54ee2e1
Fix network tests (again)
bkchr Oct 13, 2020
4862ffb
Make everything compile, finally
bkchr Oct 13, 2020
0e6f581
Fix tests
bkchr Oct 16, 2020
13289e3
Update to latest masters
bkchr Oct 21, 2020
fee1e6f
Remove ignore
bkchr Oct 21, 2020
c2e80dc
Switch to different branch in polkadot for now
bkchr Oct 21, 2020
06c5628
Update reference
bkchr Oct 23, 2020
4b18d3d
Make it compile with latest changes
bkchr Oct 27, 2020
e93c65e
Update collator/src/lib.rs
bkchr Oct 27, 2020
f2e1105
Update to latest upstream
bkchr Oct 28, 2020
07737bb
Update to latest master
bkchr Nov 5, 2020
13d2854
Fix test
bkchr Nov 8, 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
3,710 changes: 2,121 additions & 1,589 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
[workspace]
members = [
"consensus",
"message-broker",
"network",
"parachain-upgrade",
"primitives",
"rococo-parachains/",
"rococo-parachains/contracts-runtime",
"rococo-parachains/pallets/parachain-info",
"rococo-parachains/pallets/token-dealer",
"rococo-parachains/primitives",
"rococo-parachains/runtime",
"runtime",
"service",
"test/runtime",
"test/client",
"test/service",
"upward-message",
]

[profile.release]
Expand Down
45 changes: 25 additions & 20 deletions collator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,26 @@ edition = "2018"

[dependencies]
# Substrate dependencies
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
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" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-state-machine = { 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" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Polkadot dependencies
polkadot-collator = { git = "https://github.com/paritytech/polkadot", branch = "rococo-branch" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "rococo-branch" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "rococo-branch" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rococo-branch" }
polkadot-validation = { git = "https://github.com/paritytech/polkadot", branch = "rococo-branch" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test", features = [ "real-overseer" ] }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" }
polkadot-validation = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" }
polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" }
polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" }
polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" }

# Cumulus dependencies
cumulus-consensus = { path = "../consensus" }
Expand All @@ -36,17 +41,17 @@ parking_lot = "0.9"

[dev-dependencies]
# Cumulus dependencies
test-runtime = { package = "cumulus-test-runtime", path = "../test/runtime" }
test-client = { package = "cumulus-test-client", path = "../test/client" }
cumulus-test-runtime = { path = "../test/runtime" }
cumulus-test-client = { path = "../test/client" }

# Substrate dependencies
substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
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" }

# Polkadot dependencies
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "rococo-branch" }
polkadot-node-subsystem-test-helpers = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" }

# Other dependencies
env_logger = "0.7.1"
Loading