Skip to content

Commit

Permalink
Upgrade to latest polkadot@1.6.0: `cargo upgrade -v --pinned --incomp…
Browse files Browse the repository at this point in the history 
…atible` + revert encointer changes
  • Loading branch information
@bkontur
bkontur committed Jan 30, 2024
1 parent 01ce707 commit a4b126d
Show file tree
Hide file tree
Showing 21 changed files with 3,324 additions and 3,823 deletions.
5,819 changes: 2,660 additions & 3,159 deletions Cargo.lock
View file

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions chain-spec-generator/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repository.workspace = true
license.workspace = true

[dependencies]
clap = { version = "4.4.4", features = [ "derive" ] }
clap = { version = "4.4.18", features = [ "derive" ] }
hex-literal = "0.4.1"
serde_json = "1.0.111"
serde = { version = "1.0.195", features = ["derive"] }
Expand All @@ -17,20 +17,20 @@ polkadot-runtime-constants = { path = "../relay/polkadot/constants" }
kusama-runtime = { package = "staging-kusama-runtime", path = "../relay/kusama" }
kusama-runtime-constants = { path = "../relay/kusama/constants" }

sc-chain-spec = "26.0.0"
polkadot-runtime-parachains = "6.0.0"
polkadot-primitives = "6.0.0"
sp-consensus-babe = "0.31.0"
sp-authority-discovery = "25.0.0"
sp-core = "27.0.0"
pallet-staking = "27.0.0"
sc-consensus-grandpa = "0.18.0"
pallet-im-online = "26.0.0"
sp-runtime = "30.0.1"
sp-consensus-beefy = "12.0.0"
xcm = { package = "staging-xcm", version = "6.0.0" }
parachains-common = { version = "6.0.0" }
cumulus-primitives-core = { version = "0.6.0" }
sc-chain-spec = "27.0.0"
polkadot-runtime-parachains = "7.0.0"
polkadot-primitives = "7.0.0"
sp-consensus-babe = "0.32.0"
sp-authority-discovery = "26.0.0"
sp-core = "28.0.0"
pallet-staking = "28.0.0"
sc-consensus-grandpa = "0.19.0"
pallet-im-online = "27.0.0"
sp-runtime = "31.0.1"
sp-consensus-beefy = "13.0.0"
xcm = { package = "staging-xcm", version = "7.0.0" }
parachains-common = { version = "7.0.0" }
cumulus-primitives-core = { version = "0.7.0" }

asset-hub-polkadot-runtime = { path = "../system-parachains/asset-hubs/asset-hub-polkadot" }
asset-hub-kusama-runtime = { path = "../system-parachains/asset-hubs/asset-hub-kusama" }
Expand Down
26 changes: 13 additions & 13 deletions integration-tests/emulated/assets/asset-hub-kusama/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@ codec = { package = "parity-scale-codec", version = "3.6.9" }
assert_matches = "1.5.0"

# Substrate
sp-runtime = { version = "30.0.1" }
frame-support = { version = "27.0.0" }
pallet-assets = { version = "28.0.0" }
pallet-balances = { version = "27.0.0" }
pallet-asset-conversion = { version = "9.0.0" }
pallet-message-queue = { version = "30.0.0" }
sp-runtime = { version = "31.0.1" }
frame-support = { version = "28.0.0" }
pallet-assets = { version = "29.0.0" }
pallet-balances = { version = "28.0.0" }
pallet-asset-conversion = { version = "10.0.0" }
pallet-message-queue = { version = "31.0.0" }

# Polkadot
xcm = { package = "staging-xcm", version = "6.0.0" }
xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "6.0.0" }
pallet-xcm = { version = "6.0.0" }
xcm = { package = "staging-xcm", version = "7.0.0" }
xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "7.0.0" }
pallet-xcm = { version = "7.0.0" }

# Cumulus
parachains-common = { version = "6.0.0" }
xcm-emulator = { version = "0.4.0" }
asset-test-utils = { version = "6.0.0" }
parachains-common = { version = "7.0.0" }
xcm-emulator = { version = "0.5.0" }
asset-test-utils = { version = "7.0.0" }

# Local
emulated-chains = { path = "../../chains" }
Expand All @@ -37,4 +37,4 @@ kusama-runtime = { package = "staging-kusama-runtime", path = "../../../../relay
system-parachains-constants = { path = "../../../../system-parachains/constants" }

[features]
runtime-benchmarks = []
runtime-benchmarks = []
24 changes: 12 additions & 12 deletions integration-tests/emulated/assets/asset-hub-polkadot/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ publish = false
codec = { package = "parity-scale-codec", version = "3.6.9" }

# Substrate
sp-runtime = { version = "30.0.1" }
frame-support = { version = "27.0.0" }
pallet-assets = { version = "28.0.0" }
pallet-balances = { version = "27.0.0" }
pallet-message-queue = { version = "30.0.0" }
sp-runtime = { version = "31.0.1" }
frame-support = { version = "28.0.0" }
pallet-assets = { version = "29.0.0" }
pallet-balances = { version = "28.0.0" }
pallet-message-queue = { version = "31.0.0" }

# Polkadot
xcm = { package = "staging-xcm", version = "6.0.0" }
xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "6.0.0" }
pallet-xcm = { version = "6.0.0" }
xcm = { package = "staging-xcm", version = "7.0.0" }
xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "7.0.0" }
pallet-xcm = { version = "7.0.0" }

# Cumulus
parachains-common = { version = "6.0.0" }
xcm-emulator = { version = "0.4.0" }
asset-test-utils = { version = "6.0.0" }
parachains-common = { version = "7.0.0" }
xcm-emulator = { version = "0.5.0" }
asset-test-utils = { version = "7.0.0" }

# Local
emulated-chains = { path = "../../chains" }
Expand All @@ -35,4 +35,4 @@ polkadot-runtime = { path = "../../../../relay/polkadot" }
system-parachains-constants = { path = "../../../../system-parachains/constants" }

[features]
runtime-benchmarks = []
runtime-benchmarks = []
32 changes: 16 additions & 16 deletions integration-tests/emulated/chains/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,25 @@ description = "Definitions of the fellows emulated relay+para runtimes"
[dependencies]

# Substrate
grandpa-primitives = { package = "sp-consensus-grandpa", version = "12.0.0" }
sp-authority-discovery = { version = "25.0.0" }
sp-runtime = { version = "30.0.1" }
frame-support = { version = "27.0.0" }
sp-core = { version = "27.0.0" }
sp-consensus-babe = { version = "0.31.0" }
pallet-im-online = { version = "26.0.0" }
pallet-staking = { version = "27.0.0" }
beefy-primitives = { package = "sp-consensus-beefy", version = "12.0.0" }
grandpa-primitives = { package = "sp-consensus-grandpa", version = "13.0.0" }
sp-authority-discovery = { version = "26.0.0" }
sp-runtime = { version = "31.0.1" }
frame-support = { version = "28.0.0" }
sp-core = { version = "28.0.0" }
sp-consensus-babe = { version = "0.32.0" }
pallet-im-online = { version = "27.0.0" }
pallet-staking = { version = "28.0.0" }
beefy-primitives = { package = "sp-consensus-beefy", version = "13.0.0" }

# Polkadot
polkadot-primitives = { version = "6.0.0" }
polkadot-runtime-parachains = { version = "6.0.0" }
polkadot-parachain-primitives = { version = "5.0.0" }
polkadot-primitives = { version = "7.0.0" }
polkadot-runtime-parachains = { version = "7.0.0" }
polkadot-parachain-primitives = { version = "6.0.0" }

# Cumulus
parachains-common = { version = "6.0.0" }
xcm-emulator = { version = "0.4.0" }
penpal-runtime = { version = "0.13.0" }
parachains-common = { version = "7.0.0" }
xcm-emulator = { version = "0.5.0" }
penpal-runtime = { version = "0.14.0" }

# Local runtimes
kusama-runtime = { package = "staging-kusama-runtime", path = "../../../relay/kusama" }
Expand All @@ -45,4 +45,4 @@ integration-tests-common = { path = "../common" }
[features]
runtime-benchmarks = [
"penpal-runtime/runtime-benchmarks",
]
]
50 changes: 25 additions & 25 deletions integration-tests/emulated/common/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,34 +11,34 @@ codec = { package = "parity-scale-codec", version = "3.6.9" }
paste = "1.0.14"

# Substrate
grandpa-primitives = { package = "sp-consensus-grandpa", version = "12.0.0" }
sp-authority-discovery = { version = "25.0.0" }
sp-runtime = { version = "30.0.1" }
frame-support = { version = "27.0.0" }
sp-core = { version = "27.0.0" }
sp-consensus-babe = { version = "0.31.0" }
pallet-assets = { version = "28.0.0" }
pallet-balances = { version = "27.0.0" }
pallet-message-queue = { version = "30.0.0" }
pallet-im-online = { version = "26.0.0" }
beefy-primitives = { package = "sp-consensus-beefy", version = "12.0.0" }
grandpa-primitives = { package = "sp-consensus-grandpa", version = "13.0.0" }
sp-authority-discovery = { version = "26.0.0" }
sp-runtime = { version = "31.0.1" }
frame-support = { version = "28.0.0" }
sp-core = { version = "28.0.0" }
sp-consensus-babe = { version = "0.32.0" }
pallet-assets = { version = "29.0.0" }
pallet-balances = { version = "28.0.0" }
pallet-message-queue = { version = "31.0.0" }
pallet-im-online = { version = "27.0.0" }
beefy-primitives = { package = "sp-consensus-beefy", version = "13.0.0" }

# Polkadot
polkadot-primitives = { version = "6.0.0" }
polkadot-runtime-parachains = { version = "6.0.0" }
xcm = { package = "staging-xcm", version = "6.0.0" }
pallet-xcm = { version = "6.0.0" }
polkadot-primitives = { version = "7.0.0" }
polkadot-runtime-parachains = { version = "7.0.0" }
xcm = { package = "staging-xcm", version = "7.0.0" }
pallet-xcm = { version = "7.0.0" }

# Cumulus
parachains-common = { version = "6.0.0" }
cumulus-primitives-core = { version = "0.6.0" }
xcm-emulator = { version = "0.4.0" }
cumulus-pallet-xcmp-queue = { version = "0.6.0" }
cumulus-pallet-parachain-system = { features = ["parameterized-consensus-hook",] , version = "0.6.0" }
asset-test-utils = { version = "6.0.0" }
cumulus-pallet-dmp-queue = { version = "0.6.0" }
parachains-common = { version = "7.0.0" }
cumulus-primitives-core = { version = "0.7.0" }
xcm-emulator = { version = "0.5.0" }
cumulus-pallet-xcmp-queue = { version = "0.7.0" }
cumulus-pallet-parachain-system = { features = ["parameterized-consensus-hook",] , version = "0.7.0" }
asset-test-utils = { version = "7.0.0" }
cumulus-pallet-dmp-queue = { version = "0.7.0" }

# Bridges
bp-messages = { version = "0.6.0" }
pallet-bridge-messages = { version = "0.6.0" }
bridge-runtime-common = { version = "0.6.0" }
bp-messages = { version = "0.7.0" }
pallet-bridge-messages = { version = "0.7.0" }
bridge-runtime-common = { version = "0.7.0" }
Loading

0 comments on commit a4b126d

Please sign in to comment.