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.

Sign up for GitHub

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

chore: upgrade stable2409 #412

Merged
merged 20 commits into from
Dec 31, 2024
Merged

chore: upgrade stable2409 #412

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2495e3d
refactor: sdk runtimes
Daanvdplas Dec 17, 2024
9fc485c
refactor: relay folder
Daanvdplas Dec 17, 2024
a82e5f4
chore: upgrade to stable2407
chungquantin Aug 23, 2024
59c6aa2
chore: 2409
Daanvdplas Dec 18, 2024
bf0206d
chore: dependencies propagation
Daanvdplas Dec 18, 2024
5409bd1
chore: westend dep
Daanvdplas Dec 18, 2024
197f182
chore: ismp to stable2409
Daanvdplas Dec 19, 2024
3fe17a2
fix: Xcm FeeManager
Daanvdplas Dec 19, 2024
5a52b05
fix: mistake after rebase
Daanvdplas Dec 19, 2024
94e12f8
fix: remove local file made during upgrade
Daanvdplas Dec 19, 2024
c974cba
fix: assets error
Daanvdplas Dec 19, 2024
f2c3131
chore: bump jsonrpsee
Daanvdplas Dec 20, 2024
17627f4
chore: Cargo.lock
Daanvdplas Dec 20, 2024
b93494f
fix: integrity tests
Daanvdplas Dec 20, 2024
013173b
style: docs
Daanvdplas Dec 20, 2024
373225e
style: remove unnecessary multiplier
Daanvdplas Dec 21, 2024
9e2e592
chore: default contracts config
Daanvdplas Dec 21, 2024
3836f2d
docs: time in blocks
Daanvdplas Dec 21, 2024
ed76d6a
Revert "chore: default contracts config"
Daanvdplas Dec 29, 2024
3a9b9da
chore: add server feature back to jsonrpsee dep
Daanvdplas Dec 29, 2024
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
7,425 changes: 3,317 additions & 4,108 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

193 changes: 97 additions & 96 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ members = [
resolver = "2"

[workspace.dependencies]
clap = { version = "4.5.1", features = [ "derive" ] }
anyhow = { version = "1.0", default-features = false }
clap = { version = "4.5.10", features = [ "derive" ] }
codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = [
"derive",
] }
Expand All @@ -45,14 +46,14 @@ futures = "0.3.30"
hex = "0.4.3"
hex-literal = "0.4.1"
impl-trait-for-tuples = "0.2.2"
jsonrpsee = { version = "0.23.2", features = [ "server" ] }
log = { version = "0.4.21", default-features = false }
jsonrpsee = { version = "0.24.3" }
Daanvdplas marked this conversation as resolved.
Show resolved Hide resolved
log = { version = "0.4.22", default-features = false }
rand = "0.8.5"
scale-info = { version = "2.11.1", default-features = false, features = [
"derive",
] }
serde = "1.0.197"
serde_json = "1.0.121"
serde = "1.0.209"
serde_json = "1.0.127"
smallvec = "1.11.2"
subxt = "0.34.0"
subxt-signer = "0.34.0"
Expand All @@ -61,7 +62,7 @@ tracing-subscriber = { version = "0.3.18", default-features = false }

# Build
substrate-build-script-utils = "11.0.0"
substrate-wasm-builder = "24.0.0"
substrate-wasm-builder = "24.0.1"

# Local
pallet-api = { path = "pallets/api", default-features = false }
Expand All @@ -74,126 +75,126 @@ pop-runtime-mainnet = { path = "runtime/mainnet", default-features = true } # de
pop-runtime-testnet = { path = "runtime/testnet", default-features = true } # default-features=true required for `-p pop-node` builds

# Substrate
frame-benchmarking = { version = "37.0.0", default-features = false }
frame-benchmarking-cli = "42.0.0"
frame-executive = { version = "37.0.0", default-features = false }
frame-metadata-hash-extension = { version = "0.5.0", default-features = false }
frame-support = { version = "37.0.0", default-features = false }
frame-support-procedural = { version = "30.0.2", default-features = false }
frame-system = { version = "37.0.0", default-features = false }
frame-system-benchmarking = { version = "37.0.0", default-features = false }
frame-benchmarking = { version = "38.0.0", default-features = false }
frame-benchmarking-cli = "43.0.0"
frame-executive = { version = "38.0.0", default-features = false }
frame-metadata-hash-extension = { version = "0.6.0", default-features = false }
frame-support = { version = "38.0.0", default-features = false }
frame-support-procedural = { version = "30.0.3", default-features = false }
frame-system = { version = "38.0.0", default-features = false }
frame-system-benchmarking = { version = "38.0.0", default-features = false }
frame-system-rpc-runtime-api = { version = "34.0.0", default-features = false }
frame-try-runtime = { version = "0.43.0", default-features = false }
pallet-assets = { version = "39.0.0", default-features = false }
pallet-aura = { version = "36.0.0", default-features = false }
pallet-authorship = { version = "37.0.0", default-features = false }
pallet-balances = { version = "38.0.0", default-features = false }
pallet-contracts = { version = "37.0.0", default-features = false }
pallet-message-queue = { version = "40.0.0", default-features = false }
pallet-multisig = { version = "37.0.0", default-features = false }
pallet-nft-fractionalization = { version = "20.0.0", default-features = false }
pallet-nfts-runtime-api = { version = "23.0.0", default-features = false }
pallet-preimage = { version = "37.0.0", default-features = false }
pallet-proxy = { version = "37.0.0", default-features = false }
pallet-scheduler = { version = "38.0.0", default-features = false }
pallet-session = { version = "37.0.0", default-features = false }
pallet-sudo = { version = "37.0.0", default-features = false }
pallet-timestamp = { version = "36.0.0", default-features = false }
pallet-transaction-payment = { version = "37.0.0", default-features = false }
pallet-transaction-payment-rpc = "40.0.0"
pallet-transaction-payment-rpc-runtime-api = { version = "37.0.0", default-features = false }
pallet-utility = { version = "37.0.0", default-features = false }
frame-try-runtime = { version = "0.44.0", default-features = false }
pallet-assets = { version = "40.0.0", default-features = false }
pallet-aura = { version = "37.0.0", default-features = false }
pallet-authorship = { version = "38.0.0", default-features = false }
pallet-balances = { version = "39.0.0", default-features = false }
pallet-contracts = { version = "38.0.0", default-features = false }
pallet-message-queue = { version = "41.0.0", default-features = false }
pallet-multisig = { version = "38.0.0", default-features = false }
pallet-nft-fractionalization = { version = "21.0.0", default-features = false }
pallet-nfts-runtime-api = { version = "24.0.0", default-features = false }
pallet-preimage = { version = "38.0.0", default-features = false }
pallet-proxy = { version = "38.0.0", default-features = false }
pallet-scheduler = { version = "39.0.0", default-features = false }
pallet-session = { version = "38.0.0", default-features = false }
pallet-sudo = { version = "38.0.0", default-features = false }
pallet-timestamp = { version = "37.0.0", default-features = false }
pallet-transaction-payment = { version = "38.0.0", default-features = false }
pallet-transaction-payment-rpc = "41.0.0"
pallet-transaction-payment-rpc-runtime-api = { version = "38.0.0", default-features = false }
pallet-utility = { version = "38.0.0", default-features = false }
prometheus-endpoint = { version = "0.17.0", default-features = false, package = "substrate-prometheus-endpoint" }
sc-basic-authorship = "0.44.0"
sc-chain-spec = "37.0.0"
sc-cli = "0.46.0"
sc-basic-authorship = "0.45.0"
sc-chain-spec = "38.0.0"
sc-cli = "0.47.0"
sc-client-api = "37.0.0"
sc-consensus = "0.43.0"
sc-executor = "0.40.0"
sc-network = "0.44.0"
sc-network-sync = "0.43.0"
sc-offchain = "39.0.0"
sc-rpc = "39.0.0"
sc-service = "0.45.0"
sc-sysinfo = "37.0.0"
sc-telemetry = "24.0.0"
sc-tracing = "37.0.0"
sc-consensus = "0.44.0"
sc-executor = "0.40.1"
sc-network = "0.45.0"
sc-network-sync = "0.44.0"
sc-offchain = "40.0.0"
sc-rpc = "40.0.0"
sc-service = "0.46.0"
sc-sysinfo = "38.0.0"
sc-telemetry = "25.0.0"
sc-tracing = "37.0.1"
sc-transaction-pool = "37.0.0"
sc-transaction-pool-api = "37.0.0"
sp-api = { version = "34.0.0", default-features = false }
sp-authority-discovery = { version = "34.0.0", default-features = false }
sp-block-builder = { version = "34.0.0", default-features = false }
sp-blockchain = "37.0.0"
sp-blockchain = "37.0.1"
sp-consensus-aura = { version = "0.40.0", default-features = false }
sp-consensus-babe = { version = "0.40.0", default-features = false }
sp-consensus-beefy = { version = "22.0.0", default-features = false }
sp-consensus-beefy = { version = "22.1.0", default-features = false }
sp-consensus-grandpa = { version = "21.0.0", default-features = false }
sp-core = { version = "34.0.0", default-features = false }
sp-genesis-builder = { version = "0.15.0", default-features = false }
sp-genesis-builder = { version = "0.15.1", default-features = false }
sp-inherents = { version = "34.0.0", default-features = false }
sp-io = { version = "38.0.0", default-features = false }
sp-keystore = "0.40.0"
sp-mmr-primitives = { version = "34.0.0", default-features = false }
sp-mmr-primitives = { version = "34.1.0", default-features = false }
sp-offchain = { version = "34.0.0", default-features = false }
sp-runtime = { version = "39.0.0", default-features = false }
sp-session = { version = "35.0.0", default-features = false }
sp-runtime = { version = "39.0.1", default-features = false }
sp-session = { version = "36.0.0", default-features = false }
sp-std = { version = "14.0.0", default-features = false }
sp-timestamp = "34.0.0"
sp-transaction-pool = { version = "34.0.0", default-features = false }
sp-version = { version = "37.0.0", default-features = false }
substrate-frame-rpc-system = "38.0.0"
substrate-frame-rpc-system = "39.0.0"

# Polkadot
pallet-xcm = { version = "16.0.0", default-features = false }
polkadot-cli = "17.0.0"
pallet-xcm = { version = "17.0.0", default-features = false }
polkadot-cli = "19.0.0"
polkadot-parachain-primitives = { version = "14.0.0", default-features = false }
polkadot-primitives = { version = "15.0.0", default-features = false }
polkadot-runtime-common = { version = "16.0.0", default-features = false }
polkadot-runtime-parachains = { version = "16.0.0", default-features = false }
rococo-runtime = { version = "17.0.0", default-features = false }
rococo-runtime-constants = { version = "16.0.0", default-features = false }
xcm = { version = "14.1.0", package = "staging-xcm", default-features = false }
xcm-builder = { version = "16.0.0", package = "staging-xcm-builder", default-features = false }
xcm-executor = { version = "16.0.0", package = "staging-xcm-executor", default-features = false }
polkadot-primitives = { version = "16.0.0", default-features = false }
polkadot-runtime-common = { version = "17.0.0", default-features = false }
polkadot-runtime-parachains = { version = "17.0.0", default-features = false }
rococo-runtime = { version = "18.0.0", default-features = false }
rococo-runtime-constants = { version = "17.0.0", default-features = false }
xcm = { version = "14.2.0", package = "staging-xcm", default-features = false }
xcm-builder = { version = "17.0.0", package = "staging-xcm-builder", default-features = false }
xcm-executor = { version = "17.0.0", package = "staging-xcm-executor", default-features = false }

# Cumulus
asset-hub-rococo-runtime = { version = "0.21.0", default-features = false }
asset-test-utils = { version = "17.0.0", default-features = false }
asset-hub-rococo-runtime = { version = "0.22.0", default-features = false }
asset-test-utils = { version = "18.0.0", default-features = false }
color-print = "0.3.4"
cumulus-client-cli = "0.17.0"
cumulus-client-collator = "0.17.0"
cumulus-client-consensus-aura = "0.17.0"
cumulus-client-consensus-common = "0.17.0"
cumulus-client-consensus-proposer = "0.15.0"
cumulus-client-service = "0.17.0"
cumulus-pallet-aura-ext = { version = "0.16.0", default-features = false }
cumulus-pallet-parachain-system = { version = "0.16.0", default-features = false }
cumulus-pallet-session-benchmarking = { version = "18.0.0", default-features = false }
cumulus-pallet-xcm = { version = "0.16.0", default-features = false }
cumulus-pallet-xcmp-queue = { version = "0.16.0", default-features = false }
cumulus-client-cli = "0.18.0"
cumulus-client-collator = "0.18.0"
cumulus-client-consensus-aura = "0.18.0"
cumulus-client-consensus-common = "0.18.0"
cumulus-client-consensus-proposer = "0.16.0"
cumulus-client-service = "0.19.0"
cumulus-pallet-aura-ext = { version = "0.17.0", default-features = false }
cumulus-pallet-parachain-system = { version = "0.17.0", default-features = false }
cumulus-pallet-session-benchmarking = { version = "19.0.0", default-features = false }
cumulus-pallet-xcm = { version = "0.17.0", default-features = false }
cumulus-pallet-xcmp-queue = { version = "0.17.0", default-features = false }
cumulus-primitives-aura = { version = "0.15.0", default-features = false }
cumulus-primitives-core = { version = "0.15.0", default-features = false }
cumulus-primitives-parachain-inherent = "0.15.0"
cumulus-primitives-storage-weight-reclaim = { version = "7.0.0", default-features = false }
cumulus-primitives-utility = { version = "0.16.0", default-features = false }
cumulus-relay-chain-interface = "0.17.0"
emulated-integration-tests-common = { version = "13.0.0", default-features = false }
pallet-collator-selection = { version = "18.0.0", default-features = false }
parachain-info = { version = "0.16.0", package = "staging-parachain-info", default-features = false }
parachains-common = { version = "17.0.0", default-features = false }
cumulus-primitives-core = { version = "0.16.0", default-features = false }
cumulus-primitives-parachain-inherent = "0.16.0"
cumulus-primitives-storage-weight-reclaim = { version = "8.0.0", default-features = false }
cumulus-primitives-utility = { version = "0.17.0", default-features = false }
cumulus-relay-chain-interface = "0.18.0"
emulated-integration-tests-common = { version = "14.0.0", default-features = false }
pallet-collator-selection = { version = "19.0.0", default-features = false }
parachain-info = { version = "0.17.0", package = "staging-parachain-info", default-features = false }
parachains-common = { version = "18.0.0", default-features = false }

# Runtimes
asset-hub-paseo-runtime = { git = "https://github.com/paseo-network/runtimes/", tag = "v1.3.3", default-features = false }
asset-hub-westend-runtime = { version = "0.25.0", default-features = false }
asset-hub-westend-runtime = { version = "0.26.2", default-features = false }
paseo-runtime = { git = "https://github.com/paseo-network/runtimes/", tag = "v1.3.3", default-features = false }
paseo-runtime-constants = { git = "https://github.com/paseo-network/runtimes/", tag = "v1.3.3", default-features = false }
westend-runtime = { version = "17.0.0", default-features = false }
westend-runtime-constants = { version = "16.0.0", default-features = false }
westend-runtime = { version = "18.0.1", default-features = false }
westend-runtime-constants = { version = "17.0.0", default-features = false }

ismp = { git = "https://github.com/r0gue-io/ismp", branch = "polkadot-v1.14.0", default-features = false }
ismp-parachain = { git = "https://github.com/r0gue-io/ismp", branch = "polkadot-v1.14.0", default-features = false }
ismp-parachain-inherent = { git = "https://github.com/r0gue-io/ismp", branch = "polkadot-v1.14.0", default-features = false }
ismp-parachain-runtime-api = { git = "https://github.com/r0gue-io/ismp", branch = "polkadot-v1.14.0", default-features = false }
pallet-ismp = { git = "https://github.com/r0gue-io/ismp", branch = "polkadot-v1.14.0", default-features = false }
pallet-ismp-rpc = { git = "https://github.com/r0gue-io/ismp", branch = "polkadot-v1.14.0", default-features = false }
pallet-ismp-runtime-api = { git = "https://github.com/r0gue-io/ismp", branch = "polkadot-v1.14.0", default-features = false }
ismp = { git = "https://github.com/r0gue-io/ismp", branch = "polkadot-stable2409", default-features = false }
ismp-parachain = { git = "https://github.com/r0gue-io/ismp", branch = "polkadot-stable2409", default-features = false }
ismp-parachain-inherent = { git = "https://github.com/r0gue-io/ismp", branch = "polkadot-stable2409", default-features = false }
ismp-parachain-runtime-api = { git = "https://github.com/r0gue-io/ismp", branch = "polkadot-stable2409", default-features = false }
pallet-ismp = { git = "https://github.com/r0gue-io/ismp", branch = "polkadot-stable2409", default-features = false }
pallet-ismp-rpc = { git = "https://github.com/r0gue-io/ismp", branch = "polkadot-stable2409", default-features = false }
pallet-ismp-runtime-api = { git = "https://github.com/r0gue-io/ismp", branch = "polkadot-stable2409", default-features = false }
1 change: 1 addition & 0 deletions extension/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ std = [
"pallet-balances/std",
"pallet-contracts/std",
"pallet-timestamp/std",
"scale-info/std",
"sp-core/std",
"sp-io/std",
"sp-runtime/std",
Expand Down
5 changes: 5 additions & 0 deletions integration-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,10 @@ runtime-benchmarks = [
"pallet-assets/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"pallet-message-queue/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
"paseo-runtime?/runtime-benchmarks",
"polkadot-primitives/runtime-benchmarks",
"polkadot-runtime-parachains/runtime-benchmarks",
"pop-runtime-common/runtime-benchmarks",
"pop-runtime-devnet/runtime-benchmarks",
"pop-runtime-mainnet/runtime-benchmarks",
Expand All @@ -82,6 +84,8 @@ runtime-benchmarks = [
std = [
"asset-hub-paseo-runtime?/std",
"asset-hub-westend-runtime?/std",
"asset-test-utils/std",
"codec/std",
"cumulus-primitives-core/std",
"frame-support/std",
"pallet-assets/std",
Expand All @@ -102,6 +106,7 @@ std = [
"sp-consensus-grandpa/std",
"sp-core/std",
"sp-runtime/std",
"tracing-subscriber/std",
"westend-runtime-constants?/std",
"westend-runtime?/std",
"xcm-executor/std",
Expand Down
1 change: 1 addition & 0 deletions integration-tests/src/chains/asset_hub/genesis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ pub(crate) fn genesis() -> Storage {
)
})
.collect(),
..Default::default()
},
polkadot_xcm: PolkadotXcmConfig {
safe_xcm_version: Some(SAFE_XCM_VERSION),
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/src/chains/asset_hub/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ decl_test_parachains! {
impl_accounts_helpers_for_parachain!(AssetHub);
impl_assert_events_helpers_for_parachain!(AssetHub);
impl_assets_helpers_for_parachain!(AssetHub);
impl_foreign_assets_helpers_for_parachain!(AssetHub, xcm::v3::Location);
impl_foreign_assets_helpers_for_parachain!(AssetHub, xcm::v4::Location);
impl_xcm_helpers_for_parachain!(AssetHub);
1 change: 1 addition & 0 deletions integration-tests/src/chains/pop_network/genesis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ pub(crate) fn genesis() -> Storage {
)
})
.collect(),
..Default::default()
},
polkadot_xcm: runtime::PolkadotXcmConfig {
safe_xcm_version: Some(SAFE_XCM_VERSION),
Expand Down
1 change: 1 addition & 0 deletions integration-tests/src/chains/relay/genesis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ pub(crate) fn genesis() -> Storage {
)
})
.collect::<Vec<_>>(),
..Default::default()
},
babe: BabeConfig {
authorities: Default::default(),
Expand Down
28 changes: 28 additions & 0 deletions node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ sp-block-builder.workspace = true
sp-blockchain.workspace = true
sp-consensus-aura.workspace = true
sp-core.workspace = true
sp-genesis-builder = { workspace = true, default-features = true }
sp-io.workspace = true
sp-keystore.workspace = true
sp-offchain.workspace = true
Expand Down Expand Up @@ -93,6 +94,7 @@ substrate-build-script-utils.workspace = true
pallet-multisig.workspace = true

[features]
default = [ "std" ]
runtime-benchmarks = [
"cumulus-primitives-core/runtime-benchmarks",
"frame-benchmarking-cli/runtime-benchmarks",
Expand All @@ -106,6 +108,32 @@ runtime-benchmarks = [
"sc-service/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
]
std = [
"codec/std",
"cumulus-primitives-aura/std",
"cumulus-primitives-core/std",
"frame-benchmarking/std",
"ismp-parachain-runtime-api/std",
"ismp-parachain/std",
"log/std",
"pallet-ismp-runtime-api/std",
"pallet-multisig/std",
"polkadot-primitives/std",
"pop-runtime-common/std",
"pop-runtime-devnet/std",
"pop-runtime-mainnet/std",
"pop-runtime-testnet/std",
"sp-api/std",
"sp-block-builder/std",
"sp-consensus-aura/std",
"sp-core/std",
"sp-io/std",
"sp-offchain/std",
"sp-runtime/std",
"sp-session/std",
"sp-transaction-pool/std",
"xcm/std",
]
try-runtime = [
"polkadot-cli/try-runtime",
"pop-runtime-devnet/try-runtime",
Expand Down
Loading
Loading