Skip to content

Commit 93f30a2

Browse files
paritytech-polkadotsdk-templatebot[bot]iulianbarbu
paritytech-polkadotsdk-templatebot[bot]
and
iulianbarbu
authored
Update the solochain template to stable2409 (#14)
This synchronizes the template to the stable2409 branch. Co-authored-by: iulianbarbu <14218860+iulianbarbu@users.noreply.github.com>
1 parent 8599efc commit 93f30a2

File tree

17 files changed

+1608
-1223
lines changed

17 files changed

+1608
-1223
lines changed

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -16,59 +16,59 @@ resolver = "2"
1616
[workspace.dependencies]
1717
solochain-template-runtime = { path = "./runtime", default-features = false }
1818
pallet-template = { path = "./pallets/template", default-features = false }
19-
clap = { version = "4.5.3" }
20-
frame-benchmarking-cli = { version = "42.0.0", default-features = false }
21-
frame-system = { version = "37.0.0", default-features = false }
19+
clap = { version = "4.5.10" }
20+
frame-benchmarking-cli = { version = "43.0.0", default-features = false }
21+
frame-metadata-hash-extension = { version = "0.6.0", default-features = false }
22+
frame-system = { version = "38.0.0", default-features = false }
2223
futures = { version = "0.3.30" }
23-
jsonrpsee = { version = "0.23.2" }
24-
pallet-transaction-payment = { version = "37.0.0", default-features = false }
25-
pallet-transaction-payment-rpc = { version = "40.0.0", default-features = false }
26-
sc-basic-authorship = { version = "0.44.0", default-features = false }
27-
sc-cli = { version = "0.46.0", default-features = false }
24+
jsonrpsee = { version = "0.24.3" }
25+
pallet-transaction-payment = { version = "38.0.0", default-features = false }
26+
pallet-transaction-payment-rpc = { version = "41.0.0", default-features = false }
27+
sc-basic-authorship = { version = "0.45.0", default-features = false }
28+
sc-cli = { version = "0.47.0", default-features = false }
2829
sc-client-api = { version = "37.0.0", default-features = false }
29-
sc-consensus = { version = "0.43.0", default-features = false }
30-
sc-consensus-aura = { version = "0.44.0", default-features = false }
31-
sc-consensus-grandpa = { version = "0.29.0", default-features = false }
32-
sc-executor = { version = "0.40.0", default-features = false }
33-
sc-network = { version = "0.44.0", default-features = false }
34-
sc-offchain = { version = "39.0.0", default-features = false }
35-
sc-rpc-api = { version = "0.43.0", default-features = false }
36-
sc-service = { version = "0.45.0", default-features = false }
37-
sc-telemetry = { version = "24.0.0", default-features = false }
30+
sc-consensus = { version = "0.44.0", default-features = false }
31+
sc-consensus-aura = { version = "0.45.0", default-features = false }
32+
sc-consensus-grandpa = { version = "0.30.0", default-features = false }
33+
sc-executor = { version = "0.40.1", default-features = false }
34+
sc-network = { version = "0.45.0", default-features = false }
35+
sc-offchain = { version = "40.0.0", default-features = false }
36+
sc-service = { version = "0.46.0", default-features = false }
37+
sc-telemetry = { version = "25.0.0", default-features = false }
3838
sc-transaction-pool = { version = "37.0.0", default-features = false }
3939
sc-transaction-pool-api = { version = "37.0.0", default-features = false }
40-
serde_json = { version = "1.0.114", default-features = false }
40+
serde_json = { version = "1.0.127", default-features = false }
4141
sp-api = { version = "34.0.0", default-features = false }
4242
sp-block-builder = { version = "34.0.0", default-features = false }
43-
sp-blockchain = { version = "37.0.0", default-features = false }
43+
sp-blockchain = { version = "37.0.1", default-features = false }
4444
sp-consensus-aura = { version = "0.40.0", default-features = false }
4545
sp-consensus-grandpa = { version = "21.0.0", default-features = false }
4646
sp-core = { version = "34.0.0", default-features = false }
4747
sp-inherents = { version = "34.0.0", default-features = false }
4848
sp-io = { version = "38.0.0", default-features = false }
4949
sp-keyring = { version = "39.0.0", default-features = false }
50-
sp-runtime = { version = "39.0.0", default-features = false }
50+
sp-runtime = { version = "39.0.1", default-features = false }
5151
sp-timestamp = { version = "34.0.0", default-features = false }
52-
substrate-frame-rpc-system = { version = "38.0.0", default-features = false }
52+
substrate-frame-rpc-system = { version = "39.0.0", default-features = false }
5353
substrate-build-script-utils = { version = "11.0.0", default-features = false }
5454
codec = { version = "3.6.12", default-features = false, package = "parity-scale-codec" }
55-
frame-benchmarking = { version = "37.0.0", default-features = false }
56-
frame-executive = { version = "37.0.0", default-features = false }
57-
frame-support = { version = "37.0.0", default-features = false }
58-
frame-system-benchmarking = { version = "37.0.0", default-features = false }
55+
frame-benchmarking = { version = "38.0.0", default-features = false }
56+
frame-executive = { version = "38.0.0", default-features = false }
57+
frame-support = { version = "38.0.0", default-features = false }
58+
frame-system-benchmarking = { version = "38.0.0", default-features = false }
5959
frame-system-rpc-runtime-api = { version = "34.0.0", default-features = false }
60-
frame-try-runtime = { version = "0.43.0", default-features = false }
61-
pallet-aura = { version = "36.0.0", default-features = false }
62-
pallet-balances = { version = "38.0.0", default-features = false }
63-
pallet-grandpa = { version = "37.0.0", default-features = false }
64-
pallet-sudo = { version = "37.0.0", default-features = false }
65-
pallet-timestamp = { version = "36.0.0", default-features = false }
66-
pallet-transaction-payment-rpc-runtime-api = { version = "37.0.0", default-features = false }
60+
frame-try-runtime = { version = "0.44.0", default-features = false }
61+
pallet-aura = { version = "37.0.0", default-features = false }
62+
pallet-balances = { version = "39.0.0", default-features = false }
63+
pallet-grandpa = { version = "38.0.0", default-features = false }
64+
pallet-sudo = { version = "38.0.0", default-features = false }
65+
pallet-timestamp = { version = "37.0.0", default-features = false }
66+
pallet-transaction-payment-rpc-runtime-api = { version = "38.0.0", default-features = false }
6767
scale-info = { version = "2.11.1", default-features = false }
68-
sp-genesis-builder = { version = "0.15.0", default-features = false }
68+
sp-genesis-builder = { version = "0.15.1", default-features = false }
6969
sp-offchain = { version = "34.0.0", default-features = false }
70-
sp-session = { version = "35.0.0", default-features = false }
70+
sp-session = { version = "36.0.0", default-features = false }
7171
sp-storage = { version = "21.0.0", default-features = false }
7272
sp-transaction-pool = { version = "34.0.0", default-features = false }
7373
sp-version = { version = "37.0.0", default-features = false }
74-
substrate-wasm-builder = { version = "24.0.0", default-features = false }
74+
substrate-wasm-builder = { version = "24.0.1", default-features = false }

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ installation](#alternatives-installations) options.
2828
Use the following command to build the node without launching it:
2929

3030
```sh
31-
cargo build --package solochain-template-node --release
31+
cargo build --release
3232
```
3333

3434
### Embedded Docs

‎node/Cargo.toml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "solochain-template-node"
3-
description = "A solochain node template built with Substrate, part of Polkadot Sdk. (polkadot v1.15.0)"
3+
description = "A solochain node template built with Substrate, part of Polkadot Sdk."
44
version = "0.1.0"
55
license = "Unlicense"
66
authors.workspace = true
@@ -49,8 +49,6 @@ sp-consensus-grandpa.workspace = true
4949
sp-consensus-grandpa.default-features = true
5050
sc-client-api.workspace = true
5151
sc-client-api.default-features = true
52-
sc-rpc-api.workspace = true
53-
sc-rpc-api.default-features = true
5452
sc-basic-authorship.workspace = true
5553
sc-basic-authorship.default-features = true
5654
sp-runtime.workspace = true
@@ -71,7 +69,10 @@ sp-block-builder.workspace = true
7169
sp-block-builder.default-features = true
7270
frame-system.workspace = true
7371
frame-system.default-features = true
72+
frame-metadata-hash-extension.workspace = true
73+
frame-metadata-hash-extension.default-features = true
7474
pallet-transaction-payment.workspace = true
75+
pallet-transaction-payment.default-features = true
7576
pallet-transaction-payment-rpc.workspace = true
7677
pallet-transaction-payment-rpc.default-features = true
7778
substrate-frame-rpc-system.workspace = true

‎node/README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
3+
## Release
4+
5+
Polkadot SDK stable2409

‎node/src/benchmarking.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ pub fn create_benchmark_extrinsic(
105105
let best_hash = client.chain_info().best_hash;
106106
let best_block = client.chain_info().best_number;
107107

108-
let period = runtime::BlockHashCount::get()
108+
let period = runtime::configs::BlockHashCount::get()
109109
.checked_next_power_of_two()
110110
.map(|c| c / 2)
111111
.unwrap_or(2) as u64;
@@ -121,6 +121,7 @@ pub fn create_benchmark_extrinsic(
121121
frame_system::CheckNonce::<runtime::Runtime>::from(nonce),
122122
frame_system::CheckWeight::<runtime::Runtime>::new(),
123123
pallet_transaction_payment::ChargeTransactionPayment::<runtime::Runtime>::from(0),
124+
frame_metadata_hash_extension::CheckMetadataHash::<runtime::Runtime>::new(false),
124125
);
125126

126127
let raw_payload = runtime::SignedPayload::from_raw(
@@ -135,6 +136,7 @@ pub fn create_benchmark_extrinsic(
135136
(),
136137
(),
137138
(),
139+
None,
138140
),
139141
);
140142
let signature = raw_payload.using_encoded(|e| sender.sign(e));

‎node/src/rpc.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,12 @@ use sp_api::ProvideRuntimeApi;
1414
use sp_block_builder::BlockBuilder;
1515
use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
1616

17-
pub use sc_rpc_api::DenyUnsafe;
18-
1917
/// Full client dependencies.
2018
pub struct FullDeps<C, P> {
2119
/// The client instance to use.
2220
pub client: Arc<C>,
2321
/// Transaction pool instance.
2422
pub pool: Arc<P>,
25-
/// Whether to deny unsafe calls
26-
pub deny_unsafe: DenyUnsafe,
2723
}
2824

2925
/// Instantiate all full RPC extensions.
@@ -43,9 +39,9 @@ where
4339
use substrate_frame_rpc_system::{System, SystemApiServer};
4440

4541
let mut module = RpcModule::new(());
46-
let FullDeps { client, pool, deny_unsafe } = deps;
42+
let FullDeps { client, pool } = deps;
4743

48-
module.merge(System::new(client.clone(), pool, deny_unsafe).into_rpc())?;
44+
module.merge(System::new(client.clone(), pool).into_rpc())?;
4945
module.merge(TransactionPayment::new(client).into_rpc())?;
5046

5147
// Extend this RPC with a custom API by using the following syntax.

‎node/src/service.rs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ use futures::FutureExt;
44
use sc_client_api::{Backend, BlockBackend};
55
use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams};
66
use sc_consensus_grandpa::SharedVoterState;
7-
use sc_service::{error::Error as ServiceError, Configuration, TaskManager, WarpSyncParams};
7+
use sc_service::{error::Error as ServiceError, Configuration, TaskManager, WarpSyncConfig};
88
use sc_telemetry::{Telemetry, TelemetryWorker};
99
use sc_transaction_pool_api::OffchainTransactionPoolFactory;
10-
use solochain_template_runtime::{self, opaque::Block, RuntimeApi};
10+
use solochain_template_runtime::{self, apis::RuntimeApi, opaque::Block};
1111
use sp_consensus_aura::sr25519::AuthorityPair as AuraPair;
1212
use std::{sync::Arc, time::Duration};
1313

@@ -48,7 +48,7 @@ pub fn new_partial(config: &Configuration) -> Result<Service, ServiceError> {
4848
})
4949
.transpose()?;
5050

51-
let executor = sc_service::new_wasm_executor::<sp_io::SubstrateHostFunctions>(config);
51+
let executor = sc_service::new_wasm_executor::<sp_io::SubstrateHostFunctions>(&config.executor);
5252
let (client, backend, keystore_container, task_manager) =
5353
sc_service::new_full_parts::<Block, RuntimeApi, _>(
5454
config,
@@ -144,7 +144,7 @@ pub fn new_full<
144144
Block,
145145
<Block as sp_runtime::traits::Block>::Hash,
146146
N,
147-
>::new(&config.network);
147+
>::new(&config.network, config.prometheus_registry().cloned());
148148
let metrics = N::register_notification_metrics(config.prometheus_registry());
149149

150150
let peer_store_handle = net_config.peer_store_handle();
@@ -175,7 +175,7 @@ pub fn new_full<
175175
spawn_handle: task_manager.spawn_handle(),
176176
import_queue,
177177
block_announce_validator_builder: None,
178-
warp_sync_params: Some(WarpSyncParams::WithProvider(warp_sync)),
178+
warp_sync_config: Some(WarpSyncConfig::WithProvider(warp_sync)),
179179
block_relay: None,
180180
metrics,
181181
})?;
@@ -201,7 +201,7 @@ pub fn new_full<
201201
);
202202
}
203203

204-
let role = config.role.clone();
204+
let role = config.role;
205205
let force_authoring = config.force_authoring;
206206
let backoff_authoring_blocks: Option<()> = None;
207207
let name = config.network.node_name.clone();
@@ -212,9 +212,8 @@ pub fn new_full<
212212
let client = client.clone();
213213
let pool = transaction_pool.clone();
214214

215-
Box::new(move |deny_unsafe, _| {
216-
let deps =
217-
crate::rpc::FullDeps { client: client.clone(), pool: pool.clone(), deny_unsafe };
215+
Box::new(move |_| {
216+
let deps = crate::rpc::FullDeps { client: client.clone(), pool: pool.clone() };
218217
crate::rpc::create_full(deps).map_err(Into::into)
219218
})
220219
};

‎pallets/template/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "pallet-template"
3-
description = "FRAME pallet template for defining custom runtime logic. (polkadot v1.15.0)"
3+
description = "FRAME pallet template for defining custom runtime logic."
44
version = "0.1.0"
55
license = "Unlicense"
66
authors.workspace = true

‎pallets/template/README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
License: MIT-0
2+
3+
4+
## Release
5+
6+
Polkadot SDK stable2409

0 commit comments

Comments
 (0)