Skip to content

Commit 7582c5e

Browse files
Update the solochain template to stable2503 (#24)
This synchronizes the template to the stable2503 branch. Co-authored-by: iulianbarbu <14218860+iulianbarbu@users.noreply.github.com>
1 parent 1af6d76 commit 7582c5e

File tree

14 files changed

+1351
-1561
lines changed

14 files changed

+1351
-1561
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -17,58 +17,58 @@ resolver = "2"
1717
solochain-template-runtime = { path = "./runtime", default-features = false }
1818
pallet-template = { path = "./pallets/template", default-features = false }
1919
clap = { version = "4.5.13" }
20-
frame-benchmarking-cli = { version = "46.1.0", default-features = false }
21-
frame-metadata-hash-extension = { version = "0.7.0", default-features = false }
22-
frame-system = { version = "39.1.0", default-features = false }
20+
frame-benchmarking-cli = { version = "47.0.0", default-features = false }
21+
frame-metadata-hash-extension = { version = "0.8.0", default-features = false }
22+
frame-system = { version = "40.1.0", default-features = false }
2323
futures = { version = "0.3.31" }
2424
jsonrpsee = { version = "0.24.3" }
25-
pallet-transaction-payment = { version = "39.1.0", default-features = false }
26-
pallet-transaction-payment-rpc = { version = "42.0.0", default-features = false }
27-
sc-basic-authorship = { version = "0.48.0", default-features = false }
28-
sc-cli = { version = "0.50.1", default-features = false }
29-
sc-client-api = { version = "38.0.0", default-features = false }
30-
sc-consensus = { version = "0.47.0", default-features = false }
31-
sc-consensus-aura = { version = "0.48.0", default-features = false }
32-
sc-consensus-grandpa = { version = "0.33.0", default-features = false }
33-
sc-executor = { version = "0.41.0", default-features = false }
34-
sc-network = { version = "0.48.3", default-features = false }
35-
sc-offchain = { version = "43.0.0", default-features = false }
36-
sc-service = { version = "0.49.0", default-features = false }
37-
sc-telemetry = { version = "28.0.0", default-features = false }
38-
sc-transaction-pool = { version = "38.1.0", default-features = false }
39-
sc-transaction-pool-api = { version = "38.1.0", default-features = false }
40-
serde_json = { version = "1.0.132", default-features = false }
41-
sp-api = { version = "35.0.0", default-features = false }
42-
sp-block-builder = { version = "35.0.0", default-features = false }
43-
sp-blockchain = { version = "38.0.0", default-features = false }
44-
sp-consensus-aura = { version = "0.41.0", default-features = false }
45-
sp-consensus-grandpa = { version = "22.0.0", default-features = false }
46-
sp-core = { version = "35.0.0", default-features = false }
47-
sp-genesis-builder = { version = "0.16.0", default-features = false }
48-
sp-inherents = { version = "35.0.0", default-features = false }
49-
sp-io = { version = "39.0.0", default-features = false }
50-
sp-keyring = { version = "40.0.0", default-features = false }
51-
sp-runtime = { version = "40.1.0", default-features = false }
52-
sp-timestamp = { version = "35.0.0", default-features = false }
53-
substrate-frame-rpc-system = { version = "42.0.0", default-features = false }
25+
pallet-transaction-payment = { version = "40.0.0", default-features = false }
26+
pallet-transaction-payment-rpc = { version = "43.0.0", default-features = false }
27+
sc-basic-authorship = { version = "0.49.0", default-features = false }
28+
sc-cli = { version = "0.51.0", default-features = false }
29+
sc-client-api = { version = "39.0.0", default-features = false }
30+
sc-consensus = { version = "0.48.0", default-features = false }
31+
sc-consensus-aura = { version = "0.49.0", default-features = false }
32+
sc-consensus-grandpa = { version = "0.34.0", default-features = false }
33+
sc-executor = { version = "0.42.0", default-features = false }
34+
sc-network = { version = "0.49.0", default-features = false }
35+
sc-offchain = { version = "44.0.0", default-features = false }
36+
sc-service = { version = "0.50.0", default-features = false }
37+
sc-telemetry = { version = "28.1.0", default-features = false }
38+
sc-transaction-pool = { version = "39.0.0", default-features = false }
39+
sc-transaction-pool-api = { version = "39.0.0", default-features = false }
40+
sp-api = { version = "36.0.1", default-features = false }
41+
sp-block-builder = { version = "36.0.0", default-features = false }
42+
sp-blockchain = { version = "39.0.0", default-features = false }
43+
sp-consensus-aura = { version = "0.42.0", default-features = false }
44+
sp-core = { version = "36.1.0", default-features = false }
45+
sp-genesis-builder = { version = "0.17.0", default-features = false }
46+
sp-inherents = { version = "36.0.0", default-features = false }
47+
sp-io = { version = "40.0.0", default-features = false }
48+
sp-keyring = { version = "41.0.0", default-features = false }
49+
sp-runtime = { version = "41.1.0", default-features = false }
50+
sp-timestamp = { version = "36.0.0", default-features = false }
51+
substrate-frame-rpc-system = { version = "43.0.0", default-features = false }
5452
substrate-build-script-utils = { version = "11.0.0", default-features = false }
55-
codec = { version = "3.6.12", default-features = false, package = "parity-scale-codec" }
56-
frame-benchmarking = { version = "39.0.0", default-features = false }
57-
frame-executive = { version = "39.1.0", default-features = false }
58-
frame-support = { version = "39.1.0", default-features = false }
59-
frame-system-benchmarking = { version = "39.0.0", default-features = false }
60-
frame-system-rpc-runtime-api = { version = "35.0.0", default-features = false }
61-
frame-try-runtime = { version = "0.45.0", default-features = false }
62-
pallet-aura = { version = "38.1.0", default-features = false }
63-
pallet-balances = { version = "40.1.0", default-features = false }
64-
pallet-grandpa = { version = "39.1.0", default-features = false }
65-
pallet-sudo = { version = "39.0.0", default-features = false }
66-
pallet-timestamp = { version = "38.0.0", default-features = false }
67-
pallet-transaction-payment-rpc-runtime-api = { version = "39.0.0", default-features = false }
68-
scale-info = { version = "2.11.1", default-features = false }
69-
sp-offchain = { version = "35.0.0", default-features = false }
70-
sp-session = { version = "37.0.0", default-features = false }
53+
codec = { version = "3.7.4", default-features = false, package = "parity-scale-codec" }
54+
frame-benchmarking = { version = "40.0.0", default-features = false }
55+
frame-executive = { version = "40.0.0", default-features = false }
56+
frame-support = { version = "40.1.0", default-features = false }
57+
frame-system-benchmarking = { version = "40.0.0", default-features = false }
58+
frame-system-rpc-runtime-api = { version = "36.0.0", default-features = false }
59+
frame-try-runtime = { version = "0.46.0", default-features = false }
60+
pallet-aura = { version = "39.0.0", default-features = false }
61+
pallet-balances = { version = "41.1.0", default-features = false }
62+
pallet-grandpa = { version = "40.0.0", default-features = false }
63+
pallet-sudo = { version = "40.0.0", default-features = false }
64+
pallet-timestamp = { version = "39.0.0", default-features = false }
65+
pallet-transaction-payment-rpc-runtime-api = { version = "40.0.0", default-features = false }
66+
scale-info = { version = "2.11.6", default-features = false }
67+
serde_json = { version = "1.0.132", default-features = false }
68+
sp-consensus-grandpa = { version = "23.1.0", default-features = false }
69+
sp-offchain = { version = "36.0.0", default-features = false }
70+
sp-session = { version = "38.1.0", default-features = false }
7171
sp-storage = { version = "22.0.0", default-features = false }
72-
sp-transaction-pool = { version = "35.0.0", default-features = false }
73-
sp-version = { version = "38.0.0", default-features = false }
74-
substrate-wasm-builder = { version = "25.0.0", default-features = false }
72+
sp-transaction-pool = { version = "36.0.0", default-features = false }
73+
sp-version = { version = "39.0.0", default-features = false }
74+
substrate-wasm-builder = { version = "26.0.0", default-features = false }

node/Cargo.toml

Lines changed: 51 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -16,76 +16,73 @@ targets = ["x86_64-unknown-linux-gnu"]
1616

1717
[dependencies]
1818
clap = { features = ["derive"], workspace = true }
19+
frame-benchmarking-cli.default-features = true
20+
frame-benchmarking-cli.workspace = true
21+
frame-metadata-hash-extension.default-features = true
22+
frame-metadata-hash-extension.workspace = true
23+
frame-system.default-features = true
24+
frame-system.workspace = true
1925
futures = { features = ["thread-pool"], workspace = true }
20-
serde_json = { workspace = true, default-features = true }
2126
jsonrpsee = { features = ["server"], workspace = true }
22-
sc-cli.workspace = true
27+
pallet-transaction-payment-rpc.default-features = true
28+
pallet-transaction-payment-rpc.workspace = true
29+
pallet-transaction-payment.default-features = true
30+
pallet-transaction-payment.workspace = true
31+
sc-basic-authorship.default-features = true
32+
sc-basic-authorship.workspace = true
2333
sc-cli.default-features = true
24-
sp-core.workspace = true
25-
sp-core.default-features = true
26-
sc-executor.workspace = true
34+
sc-cli.workspace = true
35+
sc-client-api.default-features = true
36+
sc-client-api.workspace = true
37+
sc-consensus-aura.default-features = true
38+
sc-consensus-aura.workspace = true
39+
sc-consensus-grandpa.default-features = true
40+
sc-consensus-grandpa.workspace = true
41+
sc-consensus.default-features = true
42+
sc-consensus.workspace = true
2743
sc-executor.default-features = true
28-
sc-network.workspace = true
44+
sc-executor.workspace = true
2945
sc-network.default-features = true
30-
sc-service.workspace = true
46+
sc-network.workspace = true
47+
sc-offchain.default-features = true
48+
sc-offchain.workspace = true
3149
sc-service.default-features = true
32-
sc-telemetry.workspace = true
50+
sc-service.workspace = true
3351
sc-telemetry.default-features = true
34-
sc-transaction-pool.workspace = true
35-
sc-transaction-pool.default-features = true
36-
sc-transaction-pool-api.workspace = true
52+
sc-telemetry.workspace = true
3753
sc-transaction-pool-api.default-features = true
38-
sc-offchain.workspace = true
39-
sc-offchain.default-features = true
40-
sc-consensus.workspace = true
41-
sc-consensus.default-features = true
42-
sc-consensus-aura.workspace = true
43-
sc-consensus-aura.default-features = true
44-
sp-consensus-aura.workspace = true
54+
sc-transaction-pool-api.workspace = true
55+
sc-transaction-pool.default-features = true
56+
sc-transaction-pool.workspace = true
57+
solochain-template-runtime.workspace = true
58+
sp-api.default-features = true
59+
sp-api.workspace = true
60+
sp-block-builder.default-features = true
61+
sp-block-builder.workspace = true
62+
sp-blockchain.default-features = true
63+
sp-blockchain.workspace = true
4564
sp-consensus-aura.default-features = true
46-
sc-consensus-grandpa.workspace = true
47-
sc-consensus-grandpa.default-features = true
48-
sp-consensus-grandpa.workspace = true
49-
sp-consensus-grandpa.default-features = true
50-
sp-genesis-builder.workspace = true
65+
sp-consensus-aura.workspace = true
66+
sp-core.default-features = true
67+
sp-core.workspace = true
5168
sp-genesis-builder.default-features = true
52-
sc-client-api.workspace = true
53-
sc-client-api.default-features = true
54-
sc-basic-authorship.workspace = true
55-
sc-basic-authorship.default-features = true
56-
sp-runtime.workspace = true
57-
sp-runtime.default-features = true
58-
sp-io.workspace = true
59-
sp-io.default-features = true
60-
sp-timestamp.workspace = true
61-
sp-timestamp.default-features = true
62-
sp-inherents.workspace = true
69+
sp-genesis-builder.workspace = true
6370
sp-inherents.default-features = true
64-
sp-keyring.workspace = true
71+
sp-inherents.workspace = true
72+
sp-io.default-features = true
73+
sp-io.workspace = true
6574
sp-keyring.default-features = true
66-
sp-api.workspace = true
67-
sp-api.default-features = true
68-
sp-blockchain.workspace = true
69-
sp-blockchain.default-features = true
70-
sp-block-builder.workspace = true
71-
sp-block-builder.default-features = true
72-
frame-system.workspace = true
73-
frame-system.default-features = true
74-
frame-metadata-hash-extension.workspace = true
75-
frame-metadata-hash-extension.default-features = true
76-
pallet-transaction-payment.workspace = true
77-
pallet-transaction-payment.default-features = true
78-
pallet-transaction-payment-rpc.workspace = true
79-
pallet-transaction-payment-rpc.default-features = true
80-
substrate-frame-rpc-system.workspace = true
75+
sp-keyring.workspace = true
76+
sp-runtime.default-features = true
77+
sp-runtime.workspace = true
78+
sp-timestamp.default-features = true
79+
sp-timestamp.workspace = true
8180
substrate-frame-rpc-system.default-features = true
82-
frame-benchmarking-cli.workspace = true
83-
frame-benchmarking-cli.default-features = true
84-
solochain-template-runtime.workspace = true
81+
substrate-frame-rpc-system.workspace = true
8582

8683
[build-dependencies]
87-
substrate-build-script-utils.workspace = true
8884
substrate-build-script-utils.default-features = true
85+
substrate-build-script-utils.workspace = true
8986

9087
[features]
9188
default = ["std"]

node/README.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

node/src/benchmarking.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ pub fn create_benchmark_extrinsic(
122122
frame_system::CheckWeight::<runtime::Runtime>::new(),
123123
pallet_transaction_payment::ChargeTransactionPayment::<runtime::Runtime>::from(0),
124124
frame_metadata_hash_extension::CheckMetadataHash::<runtime::Runtime>::new(false),
125+
frame_system::WeightReclaim::<runtime::Runtime>::new(),
125126
);
126127

127128
let raw_payload = runtime::SignedPayload::from_raw(
@@ -137,6 +138,7 @@ pub fn create_benchmark_extrinsic(
137138
(),
138139
(),
139140
None,
141+
(),
140142
),
141143
);
142144
let signature = raw_payload.using_encoded(|e| sender.sign(e));

node/src/service.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ pub fn new_full<
169169
Vec::default(),
170170
));
171171

172-
let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) =
172+
let (network, system_rpc_tx, tx_handler_controller, sync_service) =
173173
sc_service::build_network(sc_service::BuildNetworkParams {
174174
config: &config,
175175
net_config,
@@ -329,6 +329,5 @@ pub fn new_full<
329329
);
330330
}
331331

332-
network_starter.start_network();
333332
Ok(task_manager)
334333
}

pallets/template/Cargo.toml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,11 @@ publish = false
1313
targets = ["x86_64-unknown-linux-gnu"]
1414

1515
[dependencies]
16-
codec = { features = [
17-
"derive",
18-
], workspace = true }
19-
scale-info = { features = [
20-
"derive",
21-
], workspace = true }
16+
codec = { features = ["derive"], workspace = true }
2217
frame-benchmarking = { optional = true, workspace = true }
2318
frame-support.workspace = true
2419
frame-system.workspace = true
20+
scale-info = { features = ["derive"], workspace = true }
2521

2622
[dev-dependencies]
2723
sp-core = { default-features = true, workspace = true }
@@ -41,8 +37,10 @@ runtime-benchmarks = [
4137
"frame-benchmarking/runtime-benchmarks",
4238
"frame-support/runtime-benchmarks",
4339
"frame-system/runtime-benchmarks",
40+
"sp-runtime/runtime-benchmarks",
4441
]
4542
try-runtime = [
4643
"frame-support/try-runtime",
4744
"frame-system/try-runtime",
45+
"sp-runtime/try-runtime",
4846
]

pallets/template/README.md

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

pallets/template/src/mock.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ mod runtime {
1818
RuntimeHoldReason,
1919
RuntimeSlashReason,
2020
RuntimeLockId,
21-
RuntimeTask
21+
RuntimeTask,
22+
RuntimeViewFunction
2223
)]
2324
pub struct Test;
2425

runtime/Cargo.toml

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,44 +13,39 @@ publish = false
1313
targets = ["x86_64-unknown-linux-gnu"]
1414

1515
[dependencies]
16-
codec = { features = [
17-
"derive",
18-
], workspace = true }
19-
scale-info = { features = [
20-
"derive",
21-
"serde",
22-
], workspace = true }
23-
serde_json = { workspace = true, default-features = false, features = ["alloc"] }
16+
codec = { features = ["derive"], workspace = true }
17+
frame-benchmarking = { optional = true, workspace = true }
18+
frame-executive.workspace = true
19+
frame-metadata-hash-extension.workspace = true
2420
frame-support = { features = ["experimental"], workspace = true }
21+
frame-system-benchmarking = { optional = true, workspace = true }
22+
frame-system-rpc-runtime-api.workspace = true
2523
frame-system.workspace = true
2624
frame-try-runtime = { optional = true, workspace = true }
27-
frame-executive.workspace = true
28-
frame-metadata-hash-extension.workspace = true
2925
pallet-aura.workspace = true
3026
pallet-balances.workspace = true
3127
pallet-grandpa.workspace = true
3228
pallet-sudo.workspace = true
29+
pallet-template.workspace = true
3330
pallet-timestamp.workspace = true
31+
pallet-transaction-payment-rpc-runtime-api.workspace = true
3432
pallet-transaction-payment.workspace = true
33+
scale-info = { features = ["derive", "serde"], workspace = true }
34+
serde_json = { workspace = true, default-features = false, features = ["alloc"] }
3535
sp-api.workspace = true
3636
sp-block-builder.workspace = true
3737
sp-consensus-aura = { features = ["serde"], workspace = true }
3838
sp-consensus-grandpa = { features = ["serde"], workspace = true }
39-
sp-keyring.workspace = true
4039
sp-core = { features = ["serde"], workspace = true }
40+
sp-genesis-builder.workspace = true
4141
sp-inherents.workspace = true
42+
sp-keyring.workspace = true
4243
sp-offchain.workspace = true
4344
sp-runtime = { features = ["serde"], workspace = true }
4445
sp-session.workspace = true
4546
sp-storage.workspace = true
4647
sp-transaction-pool.workspace = true
4748
sp-version = { features = ["serde"], workspace = true }
48-
sp-genesis-builder.workspace = true
49-
frame-system-rpc-runtime-api.workspace = true
50-
pallet-transaction-payment-rpc-runtime-api.workspace = true
51-
frame-benchmarking = { optional = true, workspace = true }
52-
frame-system-benchmarking = { optional = true, workspace = true }
53-
pallet-template.workspace = true
5449

5550
[build-dependencies]
5651
substrate-wasm-builder = { optional = true, workspace = true, default-features = true }

0 commit comments

Comments
 (0)