Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extract XCM into its own repo #1184

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5,154 changes: 2,823 additions & 2,331 deletions Cargo.lock

Large diffs are not rendered by default.

10 changes: 0 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -167,16 +167,6 @@ members = [
"polkadot/utils/generate-bags",
"polkadot/utils/remote-ext-tests/bags-list",
"polkadot/utils/staking-miner",
"polkadot/xcm",
"polkadot/xcm/pallet-xcm",
"polkadot/xcm/pallet-xcm-benchmarks",
"polkadot/xcm/procedural",
"polkadot/xcm/xcm-builder",
"polkadot/xcm/xcm-executor",
"polkadot/xcm/xcm-executor/integration-tests",
"polkadot/xcm/xcm-simulator",
"polkadot/xcm/xcm-simulator/example",
"polkadot/xcm/xcm-simulator/fuzzer",
"substrate/bin/node/bench",
"substrate/bin/node/cli",
"substrate/bin/node/executor",
Expand Down
6 changes: 3 additions & 3 deletions cumulus/bridges/bin/runtime-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ sp-runtime = { path = "../../../../substrate/primitives/runtime", default-featur
sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
sp-trie = { path = "../../../../substrate/primitives/trie", default-features = false }

# Polkadot dependencies
xcm = { path = "../../../../polkadot/xcm", default-features = false }
xcm-builder = { path = "../../../../polkadot/xcm/xcm-builder", default-features = false }
# XCM dependencies
xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false }
xcm-builder = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false }

[dev-dependencies]
bp-test-utils = { path = "../../primitives/test-utils" }
Expand Down
6 changes: 3 additions & 3 deletions cumulus/bridges/modules/xcm-bridge-hub-router/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ sp-core = { path = "../../../../substrate/primitives/core", default-features = f
sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
sp-std = { path = "../../../../substrate/primitives/std", default-features = false }

# Polkadot Dependencies
# XCM Dependencies

xcm = { path = "../../../../polkadot/xcm", default-features = false }
xcm-builder = { path = "../../../../polkadot/xcm/xcm-builder", default-features = false }
xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false }
xcm-builder = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false }

[dev-dependencies]
sp-io = { path = "../../../../substrate/primitives/io" }
Expand Down
4 changes: 2 additions & 2 deletions cumulus/pallets/dmp-queue/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ sp-io = { path = "../../../substrate/primitives/io", default-features = false}
sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
sp-std = { path = "../../../substrate/primitives/std", default-features = false}

# Polkadot
xcm = { path = "../../../polkadot/xcm", default-features = false}
# XCM
xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false }

# Cumulus
cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
Expand Down
4 changes: 3 additions & 1 deletion cumulus/pallets/parachain-system/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ sp-version = { path = "../../../substrate/primitives/version", default-features

# Polkadot
polkadot-parachain = { path = "../../../polkadot/parachain", default-features = false, features = [ "wasm-api" ]}
xcm = { path = "../../../polkadot/xcm", default-features = false}

# XCM
xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false }

# Cumulus
cumulus-pallet-parachain-system-proc-macro = { path = "proc-macro", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion cumulus/pallets/xcm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ sp-runtime = { path = "../../../substrate/primitives/runtime", default-features
frame-support = { path = "../../../substrate/frame/support", default-features = false}
frame-system = { path = "../../../substrate/frame/system", default-features = false}

xcm = { path = "../../../polkadot/xcm", default-features = false}
xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false }

cumulus-primitives-core = { path = "../../primitives/core", default-features = false }

Expand Down
8 changes: 5 additions & 3 deletions cumulus/pallets/xcmp-queue/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ sp-std = { path = "../../../substrate/primitives/std", default-features = false}

# Polkadot
polkadot-runtime-common = { path = "../../../polkadot/runtime/common", default-features = false}
xcm = { path = "../../../polkadot/xcm", default-features = false}
xcm-executor = { path = "../../../polkadot/xcm/xcm-executor", default-features = false}

# XCM
xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false }
xcm-executor = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false }

# Cumulus
cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
Expand All @@ -35,7 +37,7 @@ sp-core = { path = "../../../substrate/primitives/core" }
pallet-balances = { path = "../../../substrate/frame/balances" }

# Polkadot
xcm-builder = { path = "../../../polkadot/xcm/xcm-builder" }
xcm-builder = { git = "https://github.com/paritytech/xcm", branch = "main" }

# Cumulus
cumulus-pallet-parachain-system = { path = "../parachain-system" }
Expand Down
4 changes: 3 additions & 1 deletion cumulus/parachain-template/node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ substrate-prometheus-endpoint = { path = "../../../substrate/utils/prometheus" }
# Polkadot
polkadot-cli = { path = "../../../polkadot/cli", features = ["rococo-native"] }
polkadot-primitives = { path = "../../../polkadot/primitives" }
xcm = { path = "../../../polkadot/xcm", default-features = false}

# XCM
xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}

# Cumulus
cumulus-client-cli = { path = "../../client/cli" }
Expand Down
10 changes: 6 additions & 4 deletions cumulus/parachain-template/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,14 @@ sp-transaction-pool = { path = "../../../substrate/primitives/transaction-pool",
sp-version = { path = "../../../substrate/primitives/version", default-features = false}

# Polkadot
pallet-xcm = { path = "../../../polkadot/xcm/pallet-xcm", default-features = false}
polkadot-parachain = { path = "../../../polkadot/parachain", default-features = false}
polkadot-runtime-common = { path = "../../../polkadot/runtime/common", default-features = false}
xcm = { path = "../../../polkadot/xcm", default-features = false}
xcm-builder = { path = "../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { path = "../../../polkadot/xcm/xcm-executor", default-features = false}

# XCM
pallet-xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false }
xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false }
xcm-builder = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false }
xcm-executor = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false }

# Cumulus
cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false }
Expand Down
8 changes: 5 additions & 3 deletions cumulus/parachains/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@ sp-std = { path = "../../../substrate/primitives/std", default-features = false

# Polkadot
polkadot-primitives = { path = "../../../polkadot/primitives", default-features = false}
xcm = { path = "../../../polkadot/xcm", default-features = false}
xcm-builder = { path = "../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { path = "../../../polkadot/xcm/xcm-executor", default-features = false}

# XCM
xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
xcm-builder = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
xcm-executor = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}

# Cumulus
pallet-collator-selection = { path = "../../pallets/collator-selection", default-features = false }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives"
polkadot-parachain = { path = "../../../../../../polkadot/parachain", default-features = false}
polkadot-runtime-parachains = { path = "../../../../../../polkadot/runtime/parachains" }
polkadot-runtime = { path = "../../../../../../polkadot/runtime/polkadot" }
xcm = { path = "../../../../../../polkadot/xcm", default-features = false}
xcm-executor = { path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-features = false}

# XCM
xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
xcm-executor = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
pallet-xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}

# Cumulus
parachains-common = { path = "../../../../common" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives"
polkadot-parachain = { path = "../../../../../../polkadot/parachain", default-features = false}
polkadot-runtime-parachains = { path = "../../../../../../polkadot/runtime/parachains" }
polkadot-runtime = { path = "../../../../../../polkadot/runtime/polkadot" }
xcm = { path = "../../../../../../polkadot/xcm", default-features = false}
xcm-executor = { path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-features = false}

# XCM
xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
xcm-executor = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
pallet-xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}

# Cumulus
parachains-common = { path = "../../../../common" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives"
polkadot-parachain = { path = "../../../../../../polkadot/parachain", default-features = false}
polkadot-runtime-parachains = { path = "../../../../../../polkadot/runtime/parachains" }
polkadot-runtime = { path = "../../../../../../polkadot/runtime/polkadot" }
xcm = { path = "../../../../../../polkadot/xcm", default-features = false}
xcm-executor = { path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-features = false}

# XCM
xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
xcm-executor = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
pallet-xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}

# Cumulus
parachains-common = { path = "../../../../common" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives"
polkadot-parachain = { path = "../../../../../../polkadot/parachain", default-features = false}
polkadot-runtime-parachains = { path = "../../../../../../polkadot/runtime/parachains" }
polkadot-runtime = { path = "../../../../../../polkadot/runtime/polkadot" }
xcm = { path = "../../../../../../polkadot/xcm", default-features = false}
xcm-executor = { path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-features = false}

# XCM
xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
xcm-executor = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
pallet-xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}

# Cumulus
parachains-common = { path = "../../../../common" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives"
polkadot-parachain = { path = "../../../../../../polkadot/parachain", default-features = false}
polkadot-runtime-parachains = { path = "../../../../../../polkadot/runtime/parachains" }
polkadot-runtime = { path = "../../../../../../polkadot/runtime/polkadot" }
xcm = { path = "../../../../../../polkadot/xcm", default-features = false}
xcm-executor = { path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-features = false}

# XCM
xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
xcm-executor = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
pallet-xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}

# Cumulus
parachains-common = { path = "../../../../common" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@ rococo-runtime = { path = "../../../../../polkadot/runtime/rococo" }
rococo-runtime-constants = { path = "../../../../../polkadot/runtime/rococo/constants" }
westend-runtime = { path = "../../../../../polkadot/runtime/westend" }
westend-runtime-constants = { path = "../../../../../polkadot/runtime/westend/constants" }
xcm = { path = "../../../../../polkadot/xcm", default-features = false}
xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}

# XCM
xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
xcm-executor = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
pallet-xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}

# Cumulus
parachains-common = { path = "../../../common" }
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/pallets/ping/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ sp-runtime = { path = "../../../../substrate/primitives/runtime", default-featur
frame-support = { path = "../../../../substrate/frame/support", default-features = false}
frame-system = { path = "../../../../substrate/frame/system", default-features = false}

xcm = { path = "../../../../polkadot/xcm", default-features = false}
xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}

cumulus-primitives-core = { path = "../../../primitives/core", default-features = false }
cumulus-pallet-xcm = { path = "../../../pallets/xcm", default-features = false }
Expand Down
12 changes: 7 additions & 5 deletions cumulus/parachains/runtimes/assets/asset-hub-kusama/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,16 @@ primitive-types = { version = "0.12.1", default-features = false, features = ["c

# Polkadot
kusama-runtime-constants = { path = "../../../../../polkadot/runtime/kusama/constants", default-features = false}
pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
polkadot-parachain = { path = "../../../../../polkadot/parachain", default-features = false}
polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
xcm = { path = "../../../../../polkadot/xcm", default-features = false}
xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}

# XCM
pallet-xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
pallet-xcm-benchmarks = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false, optional = true }
xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
xcm-builder = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
xcm-executor = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}

# Cumulus
cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
Expand Down
12 changes: 7 additions & 5 deletions cumulus/parachains/runtimes/assets/asset-hub-polkadot/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,17 @@ sp-version = { path = "../../../../../substrate/primitives/version", default-fea
sp-weights = { path = "../../../../../substrate/primitives/weights", default-features = false}

# Polkadot
pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
polkadot-parachain = { path = "../../../../../polkadot/parachain", default-features = false}
polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
polkadot-runtime-constants = { path = "../../../../../polkadot/runtime/polkadot/constants", default-features = false}
xcm = { path = "../../../../../polkadot/xcm", default-features = false}
xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}

# XCM
pallet-xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
pallet-xcm-benchmarks = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false, optional = true }
xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
xcm-builder = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
xcm-executor = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}

# Cumulus
cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
Expand Down
12 changes: 7 additions & 5 deletions cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,17 @@ sp-version = { path = "../../../../../substrate/primitives/version", default-fea
primitive-types = { version = "0.12.1", default-features = false, features = ["codec", "scale-info", "num-traits"] }

# Polkadot
pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
polkadot-parachain = { path = "../../../../../polkadot/parachain", default-features = false}
polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
westend-runtime-constants = { path = "../../../../../polkadot/runtime/westend/constants", default-features = false}
xcm = { path = "../../../../../polkadot/xcm", default-features = false}
xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}

# XCM
pallet-xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false }
pallet-xcm-benchmarks = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false, optional = true }
xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false }
xcm-builder = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false }
xcm-executor = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false }

# Cumulus
cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
Expand Down
10 changes: 5 additions & 5 deletions cumulus/parachains/runtimes/assets/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-fea
pallet-asset-conversion = { path = "../../../../../substrate/frame/asset-conversion", default-features = false }
pallet-asset-tx-payment = { path = "../../../../../substrate/frame/transaction-payment/asset-tx-payment", default-features = false }

# Polkadot
pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
xcm = { path = "../../../../../polkadot/xcm", default-features = false}
xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
# XCM
pallet-xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
xcm = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
xcm-builder = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}
xcm-executor = { git = "https://github.com/paritytech/xcm", branch = "main", default-features = false}

# Cumulus
parachains-common = { path = "../../../common", default-features = false }
Expand Down
Loading