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

Companion for primitives consolidation into v2 #1071

Merged
paritytech-processbot merged 5 commits into from
Mar 10, 2022
Merged

Companion for primitives consolidation into v2 #1071

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d2465ec
branches
rphmeier Mar 7, 2022
f48053a
update all primitives references
rphmeier Mar 7, 2022
3298d55
fmt
rphmeier Mar 8, 2022
7ea0a02
Update Polkadot & Substrate
bkchr Mar 10, 2022
951b999
Again
bkchr Mar 10, 2022
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
Next Next commit
branches
  • Loading branch information
@rphmeier
rphmeier committed Mar 7, 2022
commit d2465ecfae1d46e99b32314b78577a160ff5fdd8
848 changes: 566 additions & 282 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions client/collator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Polkadot
polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }

# Cumulus
cumulus-client-consensus-common = { path = "../consensus/common" }
Expand All @@ -38,7 +38,7 @@ sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "
sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Polkadot
polkadot-node-subsystem-test-helpers = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-node-subsystem-test-helpers = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }

# Cumulus
cumulus-test-client = { path = "../../test/client" }
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Polkadot
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }

# Cumulus
cumulus-relay-chain-interface = { path = "../../relay-chain-interface" }
Expand Down
12 changes: 6 additions & 6 deletions client/network/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Polkadot
polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }

# Cumulus
cumulus-relay-chain-interface = { path = "../relay-chain-interface" }
Expand All @@ -47,9 +47,9 @@ sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "maste
substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Polkadot
polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }

# Cumulus
cumulus-primitives-core = { path = "../../primitives/core" }
Expand Down
8 changes: 4 additions & 4 deletions client/pov-recovery/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", br
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Polkadot
polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }

# Cumulus
cumulus-primitives-core = { path = "../../primitives/core" }
Expand Down
10 changes: 5 additions & 5 deletions client/relay-chain-inprocess-interface/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Polkadot
polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }

# Cumulus
cumulus-primitives-core = { path = "../../primitives/core" }
Expand All @@ -39,8 +39,8 @@ cumulus-relay-chain-interface = { path = "../relay-chain-interface" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Polkadot
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }

# Cumulus
cumulus-test-service = { path = "../../test/service" }
cumulus-test-service = { path = "../../test/service" }
4 changes: 2 additions & 2 deletions client/relay-chain-interface/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ version = "0.1.0"
edition = "2021"

[dependencies]
polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }

cumulus-primitives-core = { path = "../../primitives/core" }

Expand Down
2 changes: 1 addition & 1 deletion client/relay-chain-rpc-interface/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"


[dependencies]
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }

cumulus-primitives-core = { path = "../../primitives/core" }
cumulus-relay-chain-interface = { path = "../relay-chain-interface" }
Expand Down
4 changes: 2 additions & 2 deletions client/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Polkadot
polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }

# Cumulus
cumulus-client-cli = { path = "../cli" }
Expand Down
4 changes: 2 additions & 2 deletions pallets/xcmp-queue/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Polkadot
xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "master" }
xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }

# Cumulus
cumulus-pallet-parachain-system = { path = "../parachain-system" }
Expand All @@ -56,6 +56,6 @@ std = [

runtime-benchmarks = [
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
]
10 changes: 5 additions & 5 deletions parachain-template/node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate
try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Polkadot
polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }

# Cumulus
Expand All @@ -90,4 +90,4 @@ runtime-benchmarks = [
"parachain-template-runtime/runtime-benchmarks",
"polkadot-cli/runtime-benchmarks",
]
try-runtime = ["parachain-template-runtime/try-runtime"]
try-runtime = ["parachain-template-runtime/try-runtime"]
10 changes: 5 additions & 5 deletions polkadot-parachains/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrat
pallet-contracts-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Polkadot
polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
xcm = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
xcm = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }

# Cumulus
cumulus-client-cli = { path = "../client/cli" }
Expand Down
4 changes: 2 additions & 2 deletions test/client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ pallet-transaction-payment = { git = "https://github.com/paritytech/substrate",
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Polkadot
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }

# Cumulus
cumulus-test-runtime = { path = "../runtime" }
Expand Down
2 changes: 1 addition & 1 deletion test/relay-validation-worker-provider/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ build = "build.rs"
[dependencies]

# Polkadot
polkadot-node-core-pvf = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-node-core-pvf = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
8 changes: 4 additions & 4 deletions test/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" }

# Polkadot
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }
polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }

# Cumulus
cumulus-client-cli = { path = "../../client/cli" }
Expand All @@ -66,7 +66,7 @@ futures = "0.3.5"
portpicker = "0.1.1"

# Polkadot dependencies
polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "rh-finish-v2-primitives" }

# Substrate dependencies
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
Expand Down