Skip to content

Commit b1394e3

Browse files
chungquantinpeterwhtDaanvdplasal3mart
authored
chore: upgrade to 1.14.0 (#178)
Co-authored-by: Peter White <[email protected]> Co-authored-by: Daanvdplas <[email protected]> Co-authored-by: Alejandro Martinez Andres <[email protected]>
1 parent 992fba8 commit b1394e3

File tree

25 files changed

+4078
-2566
lines changed

25 files changed

+4078
-2566
lines changed

‎Cargo.lock

+3,490-2,077
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+122-111
Original file line numberDiff line numberDiff line change
@@ -22,143 +22,154 @@ members = [
2222
"integration-tests",
2323
"primitives",
2424
]
25-
exclude = [
26-
"pop-api",
27-
"tests/contracts"
28-
]
25+
exclude = ["pop-api", "tests/contracts"]
2926

3027
resolver = "2"
3128

3229
[workspace.dependencies]
33-
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
30+
codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = [
31+
"derive",
32+
] }
3433
hex-literal = "0.4.1"
35-
log = { version = "0.4.20", default-features = false }
36-
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
37-
smallvec = "1.11.0"
38-
serde = "1.0.195"
34+
log = { version = "0.4.21", default-features = false }
35+
scale-info = { version = "2.11.1", default-features = false, features = [
36+
"derive",
37+
] }
38+
smallvec = "1.11.2"
39+
serde = "1.0.197"
3940
clap = { version = "4.4.18", features = ["derive"] }
40-
jsonrpsee = { version = "0.20.3", features = ["server"] }
41+
jsonrpsee = { version = "0.23.2", features = ["server"] }
4142
futures = "0.3.28"
42-
serde_json = "1.0.111"
43+
serde_json = "1.0.114"
4344
tracing-subscriber = { version = "0.3", default-features = false }
4445
subxt = "0.34.0"
4546
subxt-signer = "0.34.0"
4647
tokio = { version = "1.36", features = ["macros", "time", "rt-multi-thread"] }
4748

4849
# Build
49-
substrate-wasm-builder = "18.0.1"
5050
substrate-build-script-utils = "11.0.0"
51+
substrate-wasm-builder = "23.0.0"
5152

5253
# Local
53-
pop-runtime-devnet = { path = "runtime/devnet", default-features = true } # default-features=true required for `-p pop-node` builds
54+
pop-runtime-devnet = { path = "runtime/devnet", default-features = true } # default-features=true required for `-p pop-node` builds
5455
pop-runtime-testnet = { path = "runtime/testnet", default-features = true } # default-features=true required for `-p pop-node` builds
5556
pop-runtime-common = { path = "runtime/common", default-features = false }
5657
pop-primitives = { path = "./primitives", default-features = false }
5758

5859
# Substrate
59-
sc-basic-authorship = "0.35.0"
60-
sc-chain-spec = "28.0.0"
61-
sc-cli = "0.37.0"
62-
sc-client-api = "29.0.0"
63-
sc-offchain = "30.0.0"
64-
sc-consensus = "0.34.0"
65-
sc-executor = "0.33.0"
66-
sc-network = "0.35.0"
67-
sc-network-sync = "0.34.0"
68-
sc-rpc = "30.0.0"
69-
sc-service = "0.36.0"
70-
sc-sysinfo = "28.0.0"
71-
sc-telemetry = "16.0.0"
72-
sc-tracing = "29.0.0"
73-
sc-transaction-pool = "29.0.0"
74-
sc-transaction-pool-api = "29.0.0"
75-
frame-benchmarking = { version = "29.0.0", default-features = false }
76-
frame-benchmarking-cli = "33.0.0"
77-
frame-executive = { version = "29.0.0", default-features = false }
78-
frame-support = { version = "29.0.2", default-features = false }
79-
frame-system = { version = "29.0.0", default-features = false }
80-
frame-system-benchmarking = { version = "29.0.0", default-features = false }
81-
frame-system-rpc-runtime-api = { version = "27.0.0", default-features = false }
82-
frame-try-runtime = { version = "0.35.0", default-features = false }
83-
pallet-aura = { version = "28.0.0", default-features = false, features = ["experimental"] }
84-
pallet-authorship = { version = "29.0.0", default-features = false }
85-
pallet-assets = { version = "30.0.0", default-features = false }
86-
pallet-balances = { version = "29.0.2", default-features = false }
87-
pallet-contracts = { version = "28.0.0", default-features = false }
88-
pallet-message-queue = { version = "32.0.0", default-features = false }
89-
pallet-multisig = { version = "29.0.0", default-features = false }
90-
pallet-nft-fractionalization = { version = "11.0.0", default-features = false }
91-
pallet-nfts = { version = "23.0.0", default-features = false }
92-
pallet-nfts-runtime-api = { version = "15.0.0", default-features = false }
93-
pallet-preimage = { version = "29.0.0", default-features = false }
94-
pallet-proxy = { version = "29.0.0", default-features = false }
95-
pallet-scheduler = { version = "30.0.0", default-features = false }
96-
pallet-session = { version = "29.0.0", default-features = false }
97-
pallet-sudo = { version = "29.0.0", default-features = false }
98-
pallet-timestamp = { version = "28.0.0", default-features = false }
99-
pallet-transaction-payment = { version = "29.0.2", default-features = false }
100-
pallet-transaction-payment-rpc = "31.0.0"
101-
pallet-transaction-payment-rpc-runtime-api = { version = "29.0.0", default-features = false }
102-
pallet-utility = { version = "29.0.0", default-features = false }
103-
sp-api = { version = "27.0.1", default-features = false }
104-
sp-authority-discovery = { version = "27.0.0", default-features = false }
105-
sp-block-builder = { version = "27.0.0", default-features = false }
106-
sp-blockchain = "29.0.0"
107-
sp-consensus-aura = { version = "0.33.0", default-features = false }
108-
sp-consensus-babe = { version = "0.33.0", default-features = false }
109-
sp-consensus-beefy = { version = "14.0.0", default-features = false }
110-
sp-consensus-grandpa = { version = "14.0.0", default-features = false }
111-
sp-core = { version = "29.0.0", default-features = false }
112-
sp-keystore = "0.35.0"
113-
sp-io = { version = "31.0.0", default-features = false }
114-
sp-genesis-builder = { version = "0.8.0", default-features = false }
115-
sp-inherents = { version = "27.0.0", default-features = false }
116-
sp-offchain = { version = "27.0.0", default-features = false }
117-
sp-runtime = { version = "32.0.0", default-features = false }
118-
sp-timestamp = "27.0.0"
119-
substrate-frame-rpc-system = "29.0.0"
120-
substrate-prometheus-endpoint = "0.17.0"
121-
sp-session = { version = "28.0.0", default-features = false }
60+
sc-basic-authorship = "0.42.0"
61+
sc-chain-spec = "35.0.0"
62+
sc-cli = "0.44.0"
63+
sc-client-api = "35.1.0"
64+
sc-offchain = "37.0.0"
65+
sc-consensus = "0.41.0"
66+
sc-executor = "0.39.0"
67+
sc-network = "0.42.0"
68+
sc-network-sync = "0.41.0"
69+
sc-rpc = "37.0.0"
70+
sc-service = "0.43.0"
71+
sc-sysinfo = "35.0.0"
72+
sc-telemetry = "22.0.0"
73+
sc-tracing = "35.0.0"
74+
sc-transaction-pool = "35.0.0"
75+
sc-transaction-pool-api = "35.0.0"
76+
frame-benchmarking = { version = "36.0.0", default-features = false }
77+
frame-benchmarking-cli = "40.0.0"
78+
frame-executive = { version = "36.0.0", default-features = false }
79+
frame-support = { version = "36.0.0", default-features = false }
80+
frame-system = { version = "36.1.0", default-features = false }
81+
frame-system-benchmarking = { version = "36.0.0", default-features = false }
82+
frame-system-rpc-runtime-api = { version = "33.0.0", default-features = false }
83+
frame-try-runtime = { version = "0.42.0", default-features = false }
84+
frame-metadata-hash-extension = { version = "0.4.0", default-features = false }
85+
pallet-aura = { version = "35.0.0", default-features = false }
86+
pallet-authorship = { version = "36.0.0", default-features = false }
87+
pallet-assets = { version = "37.0.0", default-features = false }
88+
pallet-balances = { version = "37.0.0", default-features = false }
89+
pallet-contracts = { version = "35.0.0", default-features = false }
90+
pallet-message-queue = { version = "39.0.0", default-features = false }
91+
pallet-multisig = { version = "36.0.0", default-features = false }
92+
pallet-nft-fractionalization = { version = "18.0.0", default-features = false }
93+
pallet-nfts = { version = "30.0.0", default-features = false }
94+
pallet-nfts-runtime-api = { version = "22.0.0", default-features = false }
95+
pallet-preimage = { version = "36.0.0", default-features = false }
96+
pallet-proxy = { version = "36.0.0", default-features = false }
97+
pallet-scheduler = { version = "37.0.0", default-features = false }
98+
pallet-session = { version = "36.0.0", default-features = false }
99+
pallet-sudo = { version = "36.0.0", default-features = false }
100+
pallet-timestamp = { version = "35.0.0", default-features = false }
101+
pallet-transaction-payment = { version = "36.0.0", default-features = false }
102+
pallet-transaction-payment-rpc = "38.0.0"
103+
pallet-transaction-payment-rpc-runtime-api = { version = "36.0.0", default-features = false }
104+
pallet-utility = { version = "36.0.0", default-features = false }
105+
prometheus-endpoint = { version = "0.17.0", default-features = false, package = "substrate-prometheus-endpoint" }
106+
sp-api = { version = "33.0.0", default-features = false }
107+
sp-authority-discovery = { version = "33.0.0", default-features = false }
108+
sp-block-builder = { version = "33.0.0", default-features = false }
109+
sp-blockchain = "35.1.0"
110+
sp-consensus-aura = { version = "0.39.0", default-features = false }
111+
sp-consensus-babe = { version = "0.39.0", default-features = false }
112+
sp-consensus-beefy = { version = "20.0.0", default-features = false }
113+
sp-consensus-grandpa = { version = "20.0.0", default-features = false }
114+
sp-core = { version = "34.0.0", default-features = false }
115+
sp-keystore = "0.40.0"
116+
sp-io = { version = "37.0.0", default-features = false }
117+
sp-genesis-builder = { version = "0.14.0", default-features = false }
118+
sp-inherents = { version = "33.0.0", default-features = false }
119+
sp-offchain = { version = "33.0.0", default-features = false }
120+
sp-runtime = { version = "38.0.0", default-features = false }
121+
sp-timestamp = "33.0.0"
122+
substrate-frame-rpc-system = "36.0.0"
123+
sp-session = { version = "34.0.0", default-features = false }
122124
sp-std = { version = "14.0.0", default-features = false }
123-
sp-transaction-pool = { version = "27.0.0", default-features = false }
124-
sp-version = { version = "30.0.0", default-features = false }
125+
sp-transaction-pool = { version = "33.0.0", default-features = false }
126+
sp-version = { version = "36.0.0", default-features = false }
125127

126128
# Polkadot
127-
pallet-xcm = { version = "8.0.5", default-features = false }
128-
polkadot-cli = "8.0.0"
129-
polkadot-parachain-primitives = { version = "7.0.0", default-features = false }
130-
polkadot-runtime-parachains = { version = "8.0.3", default-features = false }
131-
polkadot-primitives = { version = "8.0.1", default-features = false }
132-
polkadot-runtime-common = { version = "8.0.3", default-features = false }
133-
xcm = { package = "staging-xcm", version = "8.0.1", default-features = false }
134-
xcm-builder = { package = "staging-xcm-builder", version = "8.0.3", default-features = false }
135-
xcm-executor = { package = "staging-xcm-executor", version = "8.0.2", default-features = false }
129+
pallet-xcm = { version = "15.0.0", default-features = false }
130+
polkadot-cli = "15.0.0"
131+
polkadot-parachain-primitives = { version = "13.0.0", default-features = false }
132+
polkadot-runtime-parachains = { version = "15.0.3", default-features = false }
133+
polkadot-primitives = { version = "14.0.0", default-features = false }
134+
polkadot-runtime-common = { version = "15.0.0", default-features = false }
135+
rococo-runtime-constants = { version = "15.0.0", default-features = false }
136+
rococo-runtime = { version = "15.0.0", default-features = false }
137+
xcm = { version = "14.0.3", package = "staging-xcm", default-features = false }
138+
xcm-builder = { version = "15.0.0", package = "staging-xcm-builder", default-features = false }
139+
xcm-executor = { version = "15.0.0", package = "staging-xcm-executor", default-features = false }
136140

137141
# Cumulus
138-
asset-test-utils = { version = "8.0.1", default-features = false }
139-
cumulus-pallet-aura-ext = { version = "0.8.0", default-features = false }
140-
cumulus-pallet-parachain-system = { version = "0.8.1", default-features = false, features = ["parameterized-consensus-hook"] }
141-
cumulus-pallet-session-benchmarking = { version = "10.0.0", default-features = false }
142-
cumulus-pallet-xcm = { version = "0.8.0", default-features = false }
143-
cumulus-pallet-xcmp-queue = { version = "0.8.0", default-features = false }
144-
cumulus-primitives-aura = { version = "0.8.0", default-features = false }
145-
cumulus-primitives-core = { version = "0.8.0", default-features = false }
146-
cumulus-primitives-utility = { version = "0.8.1", default-features = false }
147-
emulated-integration-tests-common = { version = "4.0.0", default-features = false }
148-
pallet-collator-selection = { version = "10.0.3", default-features = false }
149-
parachains-common = { version = "8.0.1", default-features = false }
150-
parachain-info = { package = "staging-parachain-info", version = "0.8.0", default-features = false }
151-
cumulus-primitives-parachain-inherent = "0.8.0"
152-
cumulus-relay-chain-interface = "0.8.0"
142+
asset-hub-rococo-runtime = { version = "0.19.0", default-features = false }
143+
asset-test-utils = { version = "15.0.0", default-features = false }
144+
cumulus-pallet-aura-ext = { version = "0.15.0", default-features = false }
145+
cumulus-pallet-parachain-system = { version = "0.15.0", default-features = false }
146+
cumulus-pallet-session-benchmarking = { version = "17.0.0", default-features = false }
147+
cumulus-pallet-xcm = { version = "0.15.0", default-features = false }
148+
cumulus-pallet-xcmp-queue = { version = "0.15.0", default-features = false }
149+
cumulus-primitives-aura = { version = "0.14.0", default-features = false }
150+
cumulus-primitives-core = { version = "0.14.0", default-features = false }
151+
cumulus-primitives-storage-weight-reclaim = { version = "6.0.2", default-features = false }
152+
cumulus-primitives-utility = { version = "0.15.0", default-features = false }
153+
emulated-integration-tests-common = { version = "11.0.0", default-features = false }
154+
pallet-collator-selection = { version = "17.0.0", default-features = false }
155+
parachains-common = { version = "15.0.0", default-features = false }
156+
parachain-info = { version = "0.15.0", package = "staging-parachain-info", default-features = false }
157+
cumulus-primitives-parachain-inherent = "0.14.0"
158+
cumulus-relay-chain-interface = "0.15.0"
153159
color-print = "0.3.4"
154-
cumulus-client-cli = "0.8.0"
155-
cumulus-client-collator = "0.8.0"
156-
cumulus-client-consensus-aura = "0.8.0"
157-
cumulus-client-consensus-common = "0.8.0"
158-
cumulus-client-consensus-proposer = "0.8.0"
159-
cumulus-client-service = "0.8.0"
160+
cumulus-client-cli = "0.15.0"
161+
cumulus-client-collator = "0.15.0"
162+
cumulus-client-consensus-aura = "0.15.0"
163+
cumulus-client-consensus-common = "0.15.0"
164+
cumulus-client-consensus-proposer = "0.14.0"
165+
cumulus-client-service = "0.15.0"
166+
167+
# TODO: Paseo (note: using polkadot as stopgap until paseo updated to polkadot sdk v1.14.0)
168+
asset-hub-paseo-runtime = { git = "https://github.com/polkadot-fellows/runtimes", default-features = false, package = "asset-hub-polkadot-runtime" }
169+
paseo-runtime = { git = "https://github.com/polkadot-fellows/runtimes", default-features = false, package = "polkadot-runtime" }
170+
paseo-runtime-constants = { git = "https://github.com/polkadot-fellows/runtimes", default-features = false, package = "polkadot-runtime-constants" }
160171

161172
# Paseo
162-
asset-hub-paseo-runtime = { git = "https://github.com/paseo-network/runtimes/", tag = "v1.2.5-system-chains", default-features = false }
163-
paseo-runtime = { git = "https://github.com/paseo-network/runtimes/", tag = "v1.2.5-system-chains", default-features = false }
164-
paseo-runtime-constants = { git = "https://github.com/paseo-network/runtimes/", tag = "v1.2.5-system-chains", default-features = false }
173+
# asset-hub-paseo-runtime = { git = "https://github.com/paseo-network/runtimes/", tag = "v1.2.5-system-chains", default-features = false }
174+
# paseo-runtime = { git = "https://github.com/paseo-network/runtimes/", tag = "v1.2.5-system-chains", default-features = false }
175+
# paseo-runtime-constants = { git = "https://github.com/paseo-network/runtimes/", tag = "v1.2.5-system-chains", default-features = false }

‎integration-tests/Cargo.toml

+6-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@ repository.workspace = true
88

99
[dev-dependencies]
1010
codec.workspace = true
11-
tracing-subscriber = { workspace = true, features = ["env-filter", "fmt", "std", "tracing-log"] }
11+
tracing-subscriber = { workspace = true, features = [
12+
"env-filter",
13+
"fmt",
14+
"std",
15+
"tracing-log",
16+
] }
1217

1318
# Substrate
1419
frame-support.workspace = true

‎integration-tests/src/chains/asset_hub_paseo/mod.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
pub(crate) mod genesis;
22

3-
use crate::chains::paseo::Paseo;
43
use emulated_integration_tests_common::{
54
impl_accounts_helpers_for_parachain, impl_assert_events_helpers_for_parachain,
65
impl_assets_helpers_for_parachain, impl_foreign_assets_helpers_for_parachain,
@@ -34,6 +33,6 @@ decl_test_parachains! {
3433
// AssetHubPaseo implementation
3534
impl_accounts_helpers_for_parachain!(AssetHubPaseo);
3635
impl_assert_events_helpers_for_parachain!(AssetHubPaseo);
37-
impl_assets_helpers_for_parachain!(AssetHubPaseo, Paseo);
38-
impl_foreign_assets_helpers_for_parachain!(AssetHubPaseo, Paseo);
36+
impl_assets_helpers_for_parachain!(AssetHubPaseo);
37+
impl_foreign_assets_helpers_for_parachain!(AssetHubPaseo, xcm::v3::Location);
3938
impl_xcm_helpers_for_parachain!(AssetHubPaseo);

‎integration-tests/src/chains/paseo/genesis.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
use emulated_integration_tests_common::{
2-
accounts, build_genesis_storage, get_account_id_from_seed, get_from_seed, get_host_config,
3-
validators,
2+
accounts, build_genesis_storage, get_from_seed, get_host_config, validators,
43
};
54
use paseo_runtime_constants::currency::UNITS as PAS;
65
use polkadot_primitives::{AssignmentId, Balance, ValidatorId};
76
use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
87
use sp_consensus_babe::AuthorityId as BabeId;
98
use sp_consensus_beefy::ecdsa_crypto::AuthorityId as BeefyId;
109
use sp_consensus_grandpa::AuthorityId as GrandpaId;
11-
use sp_core::{sr25519, storage::Storage};
10+
use sp_core::storage::Storage;
1211

1312
pub(crate) const ED: Balance = paseo_runtime_constants::currency::EXISTENTIAL_DEPOSIT;
1413
const ENDOWMENT: u128 = 1_000_000 * PAS;
@@ -58,12 +57,13 @@ pub(crate) fn genesis() -> Storage {
5857
},
5958
babe: paseo_runtime::BabeConfig {
6059
authorities: Default::default(),
61-
epoch_config: Some(paseo_runtime::BABE_GENESIS_EPOCH_CONFIG),
60+
epoch_config: paseo_runtime::BABE_GENESIS_EPOCH_CONFIG,
6261
..Default::default()
6362
},
64-
sudo: paseo_runtime::SudoConfig {
65-
key: Some(get_account_id_from_seed::<sr25519::Public>("Alice")),
66-
},
63+
// TODO: sudo pallet is not configured in polkadot runtime
64+
// sudo: runtime::SudoConfig {
65+
// key: Some(get_account_id_from_seed::<sr25519::Public>("Alice")),
66+
// },
6767
configuration: paseo_runtime::ConfigurationConfig { config: get_host_config() },
6868
registrar: paseo_runtime::RegistrarConfig {
6969
next_free_para_id: polkadot_primitives::LOWEST_PUBLIC_ID,

‎integration-tests/src/chains/paseo/mod.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use emulated_integration_tests_common::{
88

99
// Paseo declaration
1010
decl_test_relay_chains! {
11-
#[api_version(10)]
11+
#[api_version(11)]
1212
pub struct Paseo {
1313
genesis = genesis::genesis(),
1414
on_init = (),
@@ -18,7 +18,8 @@ decl_test_relay_chains! {
1818
},
1919
pallets = {
2020
XcmPallet: paseo_runtime::XcmPallet,
21-
Sudo: paseo_runtime::Sudo,
21+
// TODO: sudo pallet is not configured in polkadot runtime
22+
// Sudo: paseo_runtime::Sudo,
2223
Balances: paseo_runtime::Balances,
2324
Hrmp: paseo_runtime::Hrmp,
2425
}

‎integration-tests/src/chains/pop_network/mod.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
pub(crate) mod genesis;
22

3-
use crate::chains::paseo::Paseo;
43
use emulated_integration_tests_common::{
54
impl_accounts_helpers_for_parachain, impl_assert_events_helpers_for_parachain,
65
impl_assets_helpers_for_parachain, impl_xcm_helpers_for_parachain, impls::Parachain,
@@ -33,5 +32,5 @@ decl_test_parachains! {
3332
// PopNetwork implementation
3433
impl_accounts_helpers_for_parachain!(PopNetwork);
3534
impl_assert_events_helpers_for_parachain!(PopNetwork);
36-
impl_assets_helpers_for_parachain!(PopNetwork, Paseo);
35+
impl_assets_helpers_for_parachain!(PopNetwork);
3736
impl_xcm_helpers_for_parachain!(PopNetwork);

0 commit comments

Comments
 (0)