Skip to content

Commit 3c3ca9d

Browse files
AlexD10SAlexD10S
authored
Merge pull request #16 from r0gue-io/chore-stable2503
chore: upgrade to 2503
2 parents 7c29bba + 387072f commit 3c3ca9d

14 files changed

Lines changed: 5345 additions & 3543 deletions

File tree

‎Cargo.lock‎

Lines changed: 4899 additions & 3250 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 99 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -13,120 +13,120 @@ members = ["node", "runtime"]
1313
resolver = "2"
1414

1515
[workspace.dependencies]
16-
clap = { version = "4.5.10", features = ["derive"] }
17-
codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = [
18-
"derive",
16+
clap = { version = "4.5.26", features = ["derive"] }
17+
codec = { package = "parity-scale-codec", version = "3.7.5", default-features = false, features = [
18+
"derive",
1919
] }
20-
color-print = "0.3.4"
21-
docify = "0.2.8"
22-
futures = "0.3.30"
23-
hex-literal = "0.4.1"
24-
jsonrpsee = { version = "0.24.3", features = ["server"] }
25-
log = { version = "0.4.21", default-features = false }
26-
scale-info = { version = "2.11.1", default-features = false, features = [
27-
"derive",
20+
color-print = "0.3.7"
21+
docify = "0.4.1"
22+
futures = "0.3.31"
23+
hex-literal = "1.0.0"
24+
jsonrpsee = { version = "0.24.9", features = ["server"] }
25+
log = { version = "0.4.25", default-features = false }
26+
scale-info = { version = "2.11.6", default-features = false, features = [
27+
"derive",
2828
] }
29-
serde = { version = "1.0.209", default-features = false }
30-
serde_json = { version = "1.0.127", default-features = false }
31-
smallvec = "1.11.2"
29+
serde = { version = "1.0.217", default-features = false }
30+
serde_json = { version = "1.0.137", default-features = false }
31+
smallvec = "1.13.2"
3232

3333
# Build
3434
substrate-build-script-utils = "11.0.0"
35-
substrate-wasm-builder = "24.0.1"
35+
substrate-wasm-builder = "26.0.0"
3636

3737
# Local
3838
parachain-template-runtime = { path = "./runtime" }
3939

4040
# Substrate
41-
frame-benchmarking = { version = "38.0.0", default-features = false }
42-
frame-benchmarking-cli = "43.0.0"
43-
frame-executive = { version = "38.0.0", default-features = false }
44-
frame-support = { version = "38.2.0", default-features = false }
45-
frame-support-procedural = { version = "30.0.3", default-features = false }
46-
frame-system = { version = "38.0.0", default-features = false }
47-
frame-system-benchmarking = { version = "38.0.0", default-features = false }
48-
frame-system-rpc-runtime-api = { version = "34.0.0", default-features = false }
49-
frame-try-runtime = { version = "0.44.0", default-features = false }
50-
frame-metadata-hash-extension = { version = "0.6.0", default-features = false }
51-
pallet-aura = { version = "37.0.0", default-features = false }
52-
pallet-authorship = { version = "38.0.0", default-features = false }
53-
pallet-balances = { version = "39.0.0", default-features = false }
54-
pallet-message-queue = { version = "41.0.2", default-features = false }
55-
pallet-session = { version = "38.0.0", default-features = false }
56-
pallet-sudo = { version = "38.0.0", default-features = false }
57-
pallet-timestamp = { version = "37.0.0", default-features = false }
58-
pallet-transaction-payment = { version = "38.0.2", default-features = false }
59-
pallet-transaction-payment-rpc = "41.0.0"
60-
pallet-transaction-payment-rpc-runtime-api = { version = "38.0.0", default-features = false }
61-
prometheus-endpoint = { version = "0.17.0", default-features = false, package = "substrate-prometheus-endpoint" }
62-
sc-basic-authorship = "0.45.0"
63-
sc-chain-spec = "38.0.0"
64-
sc-cli = "0.47.0"
65-
sc-client-api = "37.0.0"
66-
sc-offchain = "40.0.0"
67-
sc-consensus = "0.44.0"
68-
sc-executor = "0.40.1"
69-
sc-network = "0.45.3"
70-
sc-network-sync = "0.44.1"
71-
sc-rpc = "40.0.0"
72-
sc-service = "0.46.0"
73-
sc-sysinfo = "38.0.0"
74-
sc-telemetry = "25.0.0"
75-
sc-tracing = "37.0.1"
76-
sc-transaction-pool = "37.0.0"
77-
sc-transaction-pool-api = "37.0.0"
78-
sp-api = { version = "34.0.0", default-features = false }
79-
sp-block-builder = { version = "34.0.0", default-features = false }
80-
sp-blockchain = "37.0.1"
81-
sp-consensus-aura = { version = "0.40.0", default-features = false }
82-
sp-core = { version = "34.0.0", default-features = false }
83-
sp-io = { version = "38.0.0", default-features = false }
84-
sp-genesis-builder = { version = "0.15.1", default-features = false }
85-
sp-inherents = { version = "34.0.0", default-features = false }
86-
sp-keystore = "0.40.0"
87-
sp-offchain = { version = "34.0.0", default-features = false }
88-
sp-runtime = { version = "39.0.5", default-features = false }
89-
sp-session = { version = "36.0.0", default-features = false }
90-
sp-std = { version = "14.0.0", default-features = false }
91-
sp-timestamp = "34.0.0"
92-
sp-transaction-pool = { version = "34.0.0", default-features = false }
93-
sp-version = { version = "37.0.0", default-features = false }
94-
substrate-frame-rpc-system = "39.0.0"
41+
frame-benchmarking = { version = "40.0.0", default-features = false }
42+
frame-benchmarking-cli = "47.0.0"
43+
frame-executive = { version = "40.0.0", default-features = false }
44+
frame-support = { version = "40.1.0", default-features = false }
45+
frame-support-procedural = { version = "33.0.0", default-features = false }
46+
frame-system = { version = "40.1.0", default-features = false }
47+
frame-system-benchmarking = { version = "40.0.0", default-features = false }
48+
frame-system-rpc-runtime-api = { version = "36.0.0", default-features = false }
49+
frame-try-runtime = { version = "0.46.0", default-features = false }
50+
frame-metadata-hash-extension = { version = "0.8.0", default-features = false }
51+
pallet-aura = { version = "39.0.0", default-features = false }
52+
pallet-authorship = { version = "40.0.0", default-features = false }
53+
pallet-balances = { version = "41.1.0", default-features = false }
54+
pallet-message-queue = { version = "43.1.0", default-features = false }
55+
pallet-session = { version = "40.0.0", default-features = false }
56+
pallet-sudo = { version = "40.0.0", default-features = false }
57+
pallet-timestamp = { version = "39.0.0", default-features = false }
58+
pallet-transaction-payment = { version = "40.0.0", default-features = false }
59+
pallet-transaction-payment-rpc = "43.0.0"
60+
pallet-transaction-payment-rpc-runtime-api = { version = "40.0.0", default-features = false }
61+
prometheus-endpoint = { version = "0.17.2", default-features = false, package = "substrate-prometheus-endpoint" }
62+
sc-basic-authorship = "0.49.0"
63+
sc-chain-spec = "42.0.0"
64+
sc-cli = "0.51.0"
65+
sc-client-api = "39.0.0"
66+
sc-offchain = "44.0.0"
67+
sc-consensus = "0.48.0"
68+
sc-executor = "0.42.0"
69+
sc-network = "0.49.0"
70+
sc-network-sync = "0.48.0"
71+
sc-rpc = "44.0.0"
72+
sc-service = "0.50.0"
73+
sc-sysinfo = "42.0.0"
74+
sc-telemetry = "28.1.0"
75+
sc-tracing = "39.0.0"
76+
sc-transaction-pool = "39.0.0"
77+
sc-transaction-pool-api = "39.0.0"
78+
sp-api = { version = "36.0.1", default-features = false }
79+
sp-block-builder = { version = "36.0.0", default-features = false }
80+
sp-blockchain = "39.0.0"
81+
sp-consensus-aura = { version = "0.42.0", default-features = false }
82+
sp-core = { version = "36.1.0", default-features = false }
83+
sp-io = { version = "40.0.0", default-features = false }
84+
sp-genesis-builder = { version = "0.17.0", default-features = false }
85+
sp-inherents = { version = "36.0.0", default-features = false }
86+
sp-keyring = { version = "41.0.0", default-features = false }
87+
sp-keystore = "0.42.0"
88+
sp-offchain = { version = "36.0.0", default-features = false }
89+
sp-runtime = { version = "41.1.0", default-features = false }
90+
sp-session = { version = "38.1.0", default-features = false }
91+
sp-timestamp = "36.0.0"
92+
sp-transaction-pool = { version = "36.0.0", default-features = false }
93+
sp-version = { version = "39.0.0", default-features = false }
94+
substrate-frame-rpc-system = "43.0.0"
9595

9696
# Contracts
97-
pallet-contracts = { version = "38.0.0", default-features = false }
97+
pallet-contracts = { version = "40.1.0", default-features = false }
9898

9999
# Revive
100-
pallet-revive = { version = "0.2.0", default-features = false }
100+
pallet-revive = { version = "0.5.0", default-features = false }
101101

102102
# Polkadot
103-
pallet-xcm = { version = "17.0.1", default-features = false }
104-
polkadot-cli = "19.0.0"
105-
polkadot-parachain-primitives = { version = "14.0.0", default-features = false }
106-
polkadot-primitives = "16.0.0"
107-
polkadot-runtime-common = { version = "17.0.0", default-features = false }
108-
xcm = { version = "14.2.0", package = "staging-xcm", default-features = false }
109-
xcm-builder = { version = "17.0.3", package = "staging-xcm-builder", default-features = false }
110-
xcm-executor = { version = "17.0.0", package = "staging-xcm-executor", default-features = false }
103+
pallet-xcm = { version = "19.1.0", default-features = false }
104+
polkadot-cli = "23.0.0"
105+
polkadot-parachain-primitives = { version = "16.1.0", default-features = false }
106+
polkadot-primitives = "18.1.0"
107+
polkadot-runtime-common = { version = "19.1.0", default-features = false }
108+
xcm = { version = "16.1.0", package = "staging-xcm", default-features = false }
109+
xcm-builder = { version = "20.0.0", package = "staging-xcm-builder", default-features = false }
110+
xcm-executor = { version = "19.1.0", package = "staging-xcm-executor", default-features = false }
111111

112112
# Cumulus
113-
cumulus-client-cli = "0.18.0"
114-
cumulus-client-collator = "0.18.0"
115-
cumulus-client-consensus-aura = "0.18.0"
116-
cumulus-client-consensus-common = "0.18.0"
117-
cumulus-client-consensus-proposer = "0.16.0"
118-
cumulus-client-service = "0.19.0"
119-
cumulus-pallet-aura-ext = { version = "0.17.0", default-features = false }
120-
cumulus-pallet-parachain-system = { version = "0.17.1", default-features = false }
121-
cumulus-pallet-session-benchmarking = { version = "19.0.0", default-features = false }
122-
cumulus-pallet-xcm = { version = "0.17.0", default-features = false }
123-
cumulus-pallet-xcmp-queue = { version = "0.17.0", default-features = false }
124-
cumulus-primitives-aura = { version = "0.15.0", default-features = false }
125-
cumulus-primitives-core = { version = "0.16.0", default-features = false }
126-
cumulus-primitives-parachain-inherent = "0.16.0"
127-
cumulus-primitives-storage-weight-reclaim = { version = "8.0.0", default-features = false }
128-
cumulus-primitives-utility = { version = "0.17.0", default-features = false }
129-
cumulus-relay-chain-interface = "0.18.0"
130-
pallet-collator-selection = { version = "19.0.0", default-features = false }
131-
parachains-common = { version = "18.0.0", default-features = false }
132-
parachain-info = { version = "0.17.0", package = "staging-parachain-info", default-features = false }
113+
cumulus-client-cli = "0.22.0"
114+
cumulus-client-collator = "0.22.0"
115+
cumulus-client-consensus-aura = "0.22.0"
116+
cumulus-client-consensus-common = "0.22.0"
117+
cumulus-client-consensus-proposer = "0.19.0"
118+
cumulus-client-service = "0.23.0"
119+
cumulus-pallet-aura-ext = { version = "0.20.0", default-features = false }
120+
cumulus-pallet-parachain-system = { version = "0.20.0", default-features = false }
121+
cumulus-pallet-session-benchmarking = { version = "21.0.0", default-features = false }
122+
cumulus-pallet-weight-reclaim = { version = "0.2.0", default-features = false }
123+
cumulus-pallet-xcm = { version = "0.19.1", default-features = false }
124+
cumulus-pallet-xcmp-queue = { version = "0.20.0", default-features = false }
125+
cumulus-primitives-aura = { version = "0.17.0", default-features = false }
126+
cumulus-primitives-core = { version = "0.18.1", default-features = false }
127+
cumulus-primitives-parachain-inherent = "0.18.1"
128+
cumulus-primitives-utility = { version = "0.20.0", default-features = false }
129+
cumulus-relay-chain-interface = "0.22.0"
130+
pallet-collator-selection = { version = "21.0.0", default-features = false }
131+
parachains-common = { version = "21.0.0", default-features = false }
132+
parachain-info = { version = "0.20.0", package = "staging-parachain-info", default-features = false }

‎node/src/command.rs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,15 @@ pub fn run() -> Result<()> {
224224

225225
runner.run_node_until_exit(|config| async move {
226226
let hwbench = (!cli.no_hardware_benchmarks)
227-
.then_some(config.database.path().map(|database_path| {
228-
let _ = std::fs::create_dir_all(database_path);
229-
sc_sysinfo::gather_hwbench(
230-
Some(database_path),
231-
&SUBSTRATE_REFERENCE_HARDWARE,
232-
)
233-
}))
227+
.then(|| {
228+
config.database.path().map(|database_path| {
229+
let _ = std::fs::create_dir_all(database_path);
230+
sc_sysinfo::gather_hwbench(
231+
Some(database_path),
232+
&SUBSTRATE_REFERENCE_HARDWARE,
233+
)
234+
})
235+
})
234236
.flatten();
235237

236238
let para_id = chain_spec::Extensions::try_get(&*config.chain_spec)

‎node/src/service.rs‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pub type Service = PartialComponents<
5353
ParachainBackend,
5454
(),
5555
sc_consensus::DefaultImportQueue<Block>,
56-
sc_transaction_pool::FullPool<Block, ParachainClient>,
56+
sc_transaction_pool::TransactionPoolHandle<Block, ParachainClient>,
5757
(
5858
ParachainBlockImport,
5959
Option<Telemetry>,
@@ -111,12 +111,15 @@ pub fn new_partial(config: &Configuration) -> Result<Service, sc_service::Error>
111111
telemetry
112112
});
113113

114-
let transaction_pool = sc_transaction_pool::BasicPool::new_full(
115-
config.transaction_pool.clone(),
116-
config.role.is_authority().into(),
117-
config.prometheus_registry(),
118-
task_manager.spawn_essential_handle(),
119-
client.clone(),
114+
let transaction_pool = Arc::from(
115+
sc_transaction_pool::Builder::new(
116+
task_manager.spawn_essential_handle(),
117+
client.clone(),
118+
config.role.is_authority().into(),
119+
)
120+
.with_options(config.transaction_pool.clone())
121+
.with_prometheus(config.prometheus_registry())
122+
.build(),
120123
);
121124

122125
let block_import = ParachainBlockImport::new(client.clone(), backend.clone());
@@ -177,7 +180,7 @@ fn start_consensus(
177180
telemetry: Option<TelemetryHandle>,
178181
task_manager: &TaskManager,
179182
relay_chain_interface: Arc<dyn RelayChainInterface>,
180-
transaction_pool: Arc<sc_transaction_pool::FullPool<Block, ParachainClient>>,
183+
transaction_pool: Arc<sc_transaction_pool::TransactionPoolHandle<Block, ParachainClient>>,
181184
keystore: KeystorePtr,
182185
relay_chain_slot_duration: Duration,
183186
para_id: ParaId,
@@ -223,6 +226,7 @@ fn start_consensus(
223226
collator_service,
224227
authoring_duration: Duration::from_millis(2000),
225228
reinitialize: false,
229+
max_pov_percentage: None,
226230
};
227231

228232
let fut = aura::run::<Block, sp_consensus_aura::sr25519::AuthorityPair, _, _, _, _, _, _, _, _>(
@@ -276,7 +280,7 @@ pub async fn start_parachain_node(
276280

277281
// NOTE: because we use Aura here explicitly, we can use `CollatorSybilResistance::Resistant`
278282
// when starting the network.
279-
let (network, system_rpc_tx, tx_handler_controller, start_network, sync_service) =
283+
let (network, system_rpc_tx, tx_handler_controller, sync_service) =
280284
build_network(BuildNetworkParams {
281285
parachain_config: &parachain_config,
282286
net_config,
@@ -293,9 +297,7 @@ pub async fn start_parachain_node(
293297
if parachain_config.offchain_worker.enabled {
294298
use futures::FutureExt;
295299

296-
task_manager.spawn_handle().spawn(
297-
"offchain-workers-runner",
298-
"offchain-work",
300+
let offchain_workers =
299301
sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions {
300302
runtime_api_provider: client.clone(),
301303
keystore: Some(params.keystore_container.keystore()),
@@ -307,9 +309,13 @@ pub async fn start_parachain_node(
307309
is_validator: parachain_config.role.is_authority(),
308310
enable_http_requests: false,
309311
custom_extensions: move |_| vec![],
310-
})
311-
.run(client.clone(), task_manager.spawn_handle())
312-
.boxed(),
312+
})?;
313+
task_manager.spawn_handle().spawn(
314+
"offchain-workers-runner",
315+
"offchain-work",
316+
offchain_workers
317+
.run(client.clone(), task_manager.spawn_handle())
318+
.boxed(),
313319
);
314320
}
315321

@@ -414,7 +420,5 @@ pub async fn start_parachain_node(
414420
)?;
415421
}
416422

417-
start_network.start_network();
418-
419423
Ok((task_manager, client))
420424
}

‎runtime/Cargo.toml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ sp-consensus-aura.workspace = true
5151
sp-core.workspace = true
5252
sp-genesis-builder.workspace = true
5353
sp-inherents.workspace = true
54+
sp-keyring.workspace = true
5455
sp-offchain.workspace = true
5556
sp-runtime.workspace = true
5657
sp-session.workspace = true
57-
sp-std.workspace = true
5858
sp-transaction-pool.workspace = true
5959
sp-version.workspace = true
6060

@@ -70,11 +70,11 @@ xcm-executor.workspace = true
7070
cumulus-pallet-aura-ext.workspace = true
7171
cumulus-pallet-parachain-system.workspace = true
7272
cumulus-pallet-session-benchmarking.workspace = true
73+
cumulus-pallet-weight-reclaim.workspace = true
7374
cumulus-pallet-xcm.workspace = true
7475
cumulus-pallet-xcmp-queue.workspace = true
7576
cumulus-primitives-aura.workspace = true
7677
cumulus-primitives-core.workspace = true
77-
cumulus-primitives-storage-weight-reclaim.workspace = true
7878
cumulus-primitives-utility.workspace = true
7979
pallet-collator-selection.workspace = true
8080
parachains-common.workspace = true
@@ -87,11 +87,11 @@ std = [
8787
"cumulus-pallet-aura-ext/std",
8888
"cumulus-pallet-parachain-system/std",
8989
"cumulus-pallet-session-benchmarking/std",
90+
"cumulus-pallet-weight-reclaim/std",
9091
"cumulus-pallet-xcm/std",
9192
"cumulus-pallet-xcmp-queue/std",
9293
"cumulus-primitives-aura/std",
9394
"cumulus-primitives-core/std",
94-
"cumulus-primitives-storage-weight-reclaim/std",
9595
"cumulus-primitives-utility/std",
9696
"frame-benchmarking?/std",
9797
"frame-executive/std",
@@ -126,10 +126,10 @@ std = [
126126
"sp-core/std",
127127
"sp-genesis-builder/std",
128128
"sp-inherents/std",
129+
"sp-keyring/std",
129130
"sp-offchain/std",
130131
"sp-runtime/std",
131132
"sp-session/std",
132-
"sp-std/std",
133133
"sp-transaction-pool/std",
134134
"sp-version/std",
135135
"xcm-builder/std",
@@ -140,6 +140,7 @@ std = [
140140
runtime-benchmarks = [
141141
"cumulus-pallet-parachain-system/runtime-benchmarks",
142142
"cumulus-pallet-session-benchmarking/runtime-benchmarks",
143+
"cumulus-pallet-weight-reclaim/runtime-benchmarks",
143144
"cumulus-pallet-xcmp-queue/runtime-benchmarks",
144145
"cumulus-primitives-core/runtime-benchmarks",
145146
"cumulus-primitives-utility/runtime-benchmarks",

0 commit comments

Comments
 (0)