Skip to content

Commit f2ca53f

Browse files
rachsrlrachsrl
authored
Merge pull request #20 from srlabs/runtimes-v1.4.0
upgrade to runtimes release 1.4.0
2 parents 6fabd82 + a706a38 commit f2ca53f

File tree

7 files changed

+92
-70
lines changed

7 files changed

+92
-70
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v4
2121
- run: rustup default nightly
22-
- run: rustup component add rustfmt clippy
22+
- run: rustup component add rustfmt clippy rust-src
2323
- uses: Swatinem/rust-cache@v2
2424
with:
2525
workspaces: "runtimes -> runtimes/target\ntemplates -> templates/target"

‎runtimes/asset-hub-kusama/Cargo.toml‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,37 @@ publish = false
77
[dependencies]
88
ziggy = { version = "1.3.0", default-features = false }
99

10-
asset-hub-kusama-runtime = { git = "https://github.com/polkadot-fellows/runtimes.git", tag = "v1.3.3", default-features = false }
11-
staging-xcm = { default-features = false , version = "14.1.0" }
10+
asset-hub-kusama-runtime = { git = "https://github.com/polkadot-fellows/runtimes.git", tag = "v1.4.0", default-features = false }
11+
staging-xcm = { default-features = false , version = "14.2.0" }
1212

13-
parachains-common = { default-features = false , version = "15.0.0" }
13+
parachains-common = { default-features = false , version = "18.0.0" }
1414

1515
codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = ["derive", "max-encoded-len"] }
1616

17-
frame-support = { default-features = false, version = "36.0.0" }
18-
frame-system = { default-features = false, version = "36.0.1" }
17+
frame-support = { default-features = false, version = "38.2.0" }
18+
frame-system = { default-features = false, version = "38.0.0" }
1919

20-
sp-runtime = { default-features = false, version = "38.0.0" }
20+
sp-runtime = { default-features = false, version = "39.0.5" }
2121
sp-state-machine = { default-features = false, version = "0.42.0" }
22-
sp-consensus-aura = { default-features = false, version = "0.39.0" }
22+
sp-consensus-aura = { default-features = false, version = "0.40.0" }
23+
sp-trie = { default-features = false, version = "37.0.0" }
24+
sp-core = { default-features = false, version = "34.0.0" }
2325

24-
pallet-timestamp = { default-features = false, version = "35.0.0" }
25-
pallet-balances = { default-features = false, version = "37.0.0" }
26-
pallet-xcm = { default-features = false, version = "15.0.0" }
27-
pallet-utility = { default-features = false, version = "36.0.0" }
28-
pallet-proxy = { default-features = false, version = "36.0.0" }
29-
pallet-multisig = { default-features = false, version = "36.0.0" }
30-
pallet-vesting = { default-features = false, version = "36.0.0" }
26+
pallet-timestamp = { default-features = false, version = "37.0.0" }
27+
pallet-balances = { default-features = false, version = "39.0.0" }
28+
pallet-xcm = { default-features = false, version = "17.0.1" }
29+
pallet-utility = { default-features = false, version = "38.0.0" }
30+
pallet-proxy = { default-features = false, version = "38.0.0" }
31+
pallet-multisig = { default-features = false, version = "38.0.0" }
32+
pallet-vesting = { default-features = false, version = "38.0.0" }
3133

32-
cumulus-primitives-core = { default-features = false , version = "0.14.0" }
33-
cumulus-primitives-parachain-inherent = { default-features = false , version = "0.14.0" }
34-
cumulus-pallet-parachain-system = { default-features = false, version = "0.15.0" }
35-
cumulus-test-relay-sproof-builder = { default-features = false , version = "0.14.0" }
34+
cumulus-primitives-core = { default-features = false , version = "0.16.0" }
35+
cumulus-primitives-parachain-inherent = { default-features = false , version = "0.16.0" }
36+
cumulus-pallet-parachain-system = { default-features = false, version = "0.17.1" }
37+
cumulus-test-relay-sproof-builder = { default-features = false , version = "0.16.0" }
38+
39+
polkadot-parachain-primitives = { default-features = false, version = "14.0.0" }
40+
polkadot-primitives = { default-features = false, version = "16.0.0" }
3641

3742
[features]
3843
default = ["std", "try-runtime"]
@@ -52,6 +57,8 @@ std = [
5257
"cumulus-primitives-parachain-inherent/std",
5358
"cumulus-pallet-parachain-system/std",
5459
"cumulus-test-relay-sproof-builder/std",
60+
"polkadot-parachain-primitives/std",
61+
"sp-trie/std",
5562
]
5663
try-runtime = [
5764
"asset-hub-kusama-runtime/try-runtime",

‎runtimes/asset-hub-kusama/src/main.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ fn generate_genesis(accounts: &[AccountId]) -> Storage {
6262
.iter()
6363
.map(|x| (x.0.clone(), x.0.clone(), SessionKeys { aura: x.1.clone() }))
6464
.collect::<Vec<_>>(),
65+
non_authority_keys: vec![],
6566
},
6667
collator_selection: CollatorSelectionConfig {
6768
invulnerables: initial_authorities.iter().map(|x| (x.0.clone())).collect(),
@@ -221,15 +222,15 @@ fn initialize_block(block: u32, prev_header: &Option<Header>) {
221222
);
222223
let sproof_builder = RelayStateSproofBuilder {
223224
para_id: 100.into(),
224-
current_slot: Slot::from(2 * u64::from(block)),
225+
current_slot: cumulus_primitives_core::relay_chain::Slot::from(2 * u64::from(block)),
225226
included_para_head: Some(parent_head.clone()),
226227
..Default::default()
227228
};
228229

229230
let (relay_parent_storage_root, relay_chain_state) =
230231
sproof_builder.into_state_root_and_proof();
231232
ParachainInherentData {
232-
validation_data: PersistedValidationData {
233+
validation_data: polkadot_primitives::PersistedValidationData {
233234
parent_head,
234235
relay_parent_number: block,
235236
relay_parent_storage_root,

‎runtimes/coretime-kusama/Cargo.toml‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,33 @@ publish = false
77
[dependencies]
88
ziggy = { version = "1.3.0", default-features = false }
99

10-
coretime-kusama-runtime = { git = "https://github.com/polkadot-fellows/runtimes.git", tag = "v1.3.3", default-features = false }
11-
system-parachains-constants = { git = "https://github.com/polkadot-fellows/runtimes.git", tag = "v1.3.3", default-features = false }
10+
coretime-kusama-runtime = { git = "https://github.com/polkadot-fellows/runtimes.git", tag = "v1.4.0", default-features = false }
11+
system-parachains-constants = { git = "https://github.com/polkadot-fellows/runtimes.git", tag = "v1.4.0", default-features = false }
1212

13-
parachains-common = { default-features = false , version = "15.0.0" }
13+
parachains-common = { default-features = false , version = "18.0.0" }
1414

1515
codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = ["derive", "max-encoded-len"] }
1616

17-
frame-support = { default-features = false, version = "36.0.0" }
18-
frame-system = { default-features = false, version = "36.0.1" }
17+
frame-support = { default-features = false, version = "38.2.0" }
18+
frame-system = { default-features = false, version = "38.0.0" }
1919

20-
sp-runtime = { default-features = false, version = "38.0.0" }
21-
sp-state-machine = { default-features = false, version = "0.42.0" }
22-
sp-consensus-aura = { default-features = false, version = "0.39.0" }
23-
sp-application-crypto = { default-features = false , version = "37.0.0" }
20+
sp-runtime = { default-features = false, version = "39.0.5" }
21+
sp-state-machine = { default-features = false, version = "0.43.0" }
22+
sp-consensus-aura = { default-features = false, version = "0.40.0" }
23+
sp-application-crypto = { default-features = false , version = "38.0.0" }
2424

25-
pallet-timestamp = { default-features = false, version = "35.0.0" }
26-
pallet-balances = { default-features = false, version = "37.0.0" }
27-
pallet-utility = { default-features = false, version = "36.0.0" }
28-
pallet-multisig = { default-features = false, version = "36.0.0" }
29-
pallet-proxy = { default-features = false, version = "36.0.0" }
30-
pallet-broker = { default-features = false, version = "0.15.0" }
31-
pallet-xcm = { default-features = false , version = "15.0.0" }
25+
pallet-timestamp = { default-features = false, version = "37.0.0" }
26+
pallet-balances = { default-features = false, version = "39.0.0" }
27+
pallet-utility = { default-features = false, version = "38.0.0" }
28+
pallet-multisig = { default-features = false, version = "38.0.0" }
29+
pallet-proxy = { default-features = false, version = "38.0.0" }
30+
pallet-broker = { default-features = false, version = "0.17.2" }
31+
pallet-xcm = { default-features = false , version = "17.0.1" }
3232

33-
cumulus-primitives-core = { default-features = false , version = "0.14.0" }
34-
cumulus-primitives-parachain-inherent = { default-features = false , version = "0.14.0" }
35-
cumulus-pallet-parachain-system = { default-features = false, version = "0.15.0" }
36-
cumulus-test-relay-sproof-builder = { default-features = false , version = "0.14.0" }
33+
cumulus-primitives-core = { default-features = false , version = "0.16.0" }
34+
cumulus-primitives-parachain-inherent = { default-features = false , version = "0.16.0" }
35+
cumulus-pallet-parachain-system = { default-features = false, version = "0.17.1" }
36+
cumulus-test-relay-sproof-builder = { default-features = false , version = "0.16.0" }
3737

3838
[features]
3939
default = ["std", "try-runtime"]
@@ -43,8 +43,14 @@ std = [
4343
"codec/std",
4444
"sp-runtime/std",
4545
"frame-support/std",
46+
"frame-system/std",
4647
"pallet-timestamp/std",
48+
"pallet-xcm/std",
4749
"sp-consensus-aura/std",
50+
"cumulus-primitives-core/std",
51+
"cumulus-primitives-parachain-inherent/std",
52+
"cumulus-pallet-parachain-system/std",
53+
"cumulus-test-relay-sproof-builder/std",
4854
]
4955
try-runtime = [
5056
"coretime-kusama-runtime/try-runtime",

‎runtimes/coretime-kusama/src/main.rs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ fn generate_genesis(accounts: &[AccountId]) -> Storage {
6464
.iter()
6565
.map(|x| (x.0.clone(), x.0.clone(), SessionKeys { aura: x.1.clone() }))
6666
.collect::<Vec<_>>(),
67+
non_authority_keys: vec![],
6768
},
6869
collator_selection: CollatorSelectionConfig {
6970
invulnerables: initial_authorities.iter().map(|x| (x.0.clone())).collect(),
@@ -257,12 +258,13 @@ fn initialize_block(block: u32, prev_header: &Option<Header>) {
257258
let coretime_burn_account: AccountId =
258259
frame_support::PalletId(*b"py/ctbrn").into_account_truncating();
259260
let coretime_burn_address = coretime_burn_account.into();
260-
Balances::transfer_keep_alive(
261+
// The transfer may result an error if there are insufficient funds in the account,
262+
// but in that case, we just don't transfer to coretime burn address
263+
let _ = Balances::transfer_keep_alive(
261264
RuntimeOrigin::signed([0; 32].into()),
262265
coretime_burn_address,
263266
UNITS,
264-
)
265-
.unwrap();
267+
);
266268
}
267269

268270
fn finalize_block(elapsed: Duration) -> Header {

‎runtimes/kusama/Cargo.toml‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,39 @@ publish = false
77
[dependencies]
88
ziggy = { version = "1.3.0", default-features = false }
99

10-
staging-kusama-runtime = { git = "https://github.com/polkadot-fellows/runtimes.git", tag = "v1.3.3", default-features = false }
11-
staging-xcm = { default-features = false , version = "14.1.0" }
10+
staging-kusama-runtime = { git = "https://github.com/polkadot-fellows/runtimes.git", tag = "v1.4.0", default-features = false }
11+
staging-xcm = { default-features = false , version = "14.2.0" }
1212

13-
kusama-runtime-constants = { git = "https://github.com/polkadot-fellows/runtimes.git", tag = "v1.3.3", default-features = false }
13+
kusama-runtime-constants = { git = "https://github.com/polkadot-fellows/runtimes.git", tag = "v1.4.0", default-features = false }
1414

15-
polkadot-primitives = { version = "14.0.0", default-features = false }
16-
polkadot-runtime-parachains = { version = "15.0.2", default-features = false }
15+
polkadot-primitives = { version = "16.0.0", default-features = false }
16+
polkadot-runtime-parachains = { version = "17.0.2", default-features = false }
1717

1818
codec = { version = "3.6.12", features = ["derive", "max-encoded-len"], default-features = false, package = "parity-scale-codec" }
1919

20-
frame-support = { default-features = false , version = "36.0.0" }
21-
frame-system = { default-features = false , version = "36.0.1" }
20+
frame-support = { default-features = false , version = "38.2.0" }
21+
frame-system = { default-features = false , version = "38.0.0" }
2222

23-
sp-application-crypto = { default-features = false , version = "37.0.0" }
24-
sp-runtime = { default-features = false , version = "38.0.0" }
25-
sp-state-machine = { default-features = false , version = "0.42.0" }
26-
sp-consensus-babe = { default-features = false , version = "0.39.0" }
27-
sp-consensus-beefy = { default-features = false , version = "20.0.0" }
28-
sp-authority-discovery = { default-features = false , version = "33.0.0" }
23+
sp-application-crypto = { default-features = false , version = "38.0.0" }
24+
sp-runtime = { default-features = false , version = "39.0.5" }
25+
sp-state-machine = { default-features = false , version = "0.43.0" }
26+
sp-consensus-babe = { default-features = false , version = "0.40.0" }
27+
sp-consensus-beefy = { default-features = false , version = "22.1.0" }
28+
sp-authority-discovery = { default-features = false , version = "34.0.0" }
29+
sp-core = { default-features = false, version = "34.0.0" }
2930

30-
pallet-balances = { default-features = false , version = "37.0.0" }
31-
pallet-grandpa = { default-features = false , version = "36.0.0" }
32-
pallet-society = { default-features = false, version = "36.0.0" }
33-
pallet-utility = { default-features = false , version = "36.0.0" }
34-
pallet-multisig = { default-features = false , version = "36.0.0" }
35-
pallet-proxy = { default-features = false , version = "36.0.0" }
36-
pallet-identity = { default-features = false , version = "36.0.0" }
37-
pallet-bounties = { default-features = false , version = "35.0.0" }
38-
pallet-staking = { default-features = false , version = "36.0.0" }
39-
pallet-timestamp = { default-features = false , version = "35.0.0" }
40-
pallet-xcm = { default-features = false , version = "15.0.0" }
41-
pallet-referenda = { default-features = false , version = "36.0.0" }
31+
pallet-balances = { default-features = false , version = "39.0.0" }
32+
pallet-grandpa = { default-features = false , version = "38.0.0" }
33+
pallet-society = { default-features = false, version = "38.0.0" }
34+
pallet-utility = { default-features = false , version = "38.0.0" }
35+
pallet-multisig = { default-features = false , version = "38.0.0" }
36+
pallet-proxy = { default-features = false , version = "38.0.0" }
37+
pallet-identity = { default-features = false , version = "38.0.0" }
38+
pallet-bounties = { default-features = false , version = "37.0.2" }
39+
pallet-staking = { default-features = false , version = "38.0.0" }
40+
pallet-timestamp = { default-features = false , version = "37.0.0" }
41+
pallet-xcm = { default-features = false , version = "17.0.1" }
42+
pallet-referenda = { default-features = false , version = "38.0.0" }
4243

4344
[features]
4445
default = ["std", "try-runtime"]
@@ -54,6 +55,9 @@ std = [
5455
"pallet-balances/std",
5556
"pallet-staking/std",
5657
"sp-consensus-babe/std",
58+
"polkadot-primitives/std",
59+
"polkadot-runtime-parachains/std",
60+
"sp-authority-discovery/std",
5761
]
5862
try-runtime = [
5963
"staging-kusama-runtime/try-runtime",

‎runtimes/kusama/src/main.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ use sp_consensus_babe::{
1818
digests::{PreDigest, SecondaryPlainPreDigest},
1919
Slot, BABE_ENGINE_ID,
2020
};
21-
use sp_runtime::{app_crypto::ByteArray, BuildStorage, Perbill};
21+
use sp_core::crypto::ByteArray;
22+
use sp_runtime::{app_crypto::ByteArray as _, BuildStorage, Perbill};
2223
use sp_runtime::{
2324
testing::H256,
2425
traits::{Dispatchable, Header as _},
@@ -74,6 +75,7 @@ fn generate_genesis(accounts: &[AccountId]) -> Storage {
7475
indices: kusama::IndicesConfig { indices: vec![] },
7576
session: kusama::SessionConfig {
7677
keys: vec![([0; 32].into(), [0; 32].into(), initial_authority)],
78+
non_authority_keys: vec![],
7779
},
7880
beefy: kusama::BeefyConfig::default(),
7981
staking: kusama::StakingConfig {

0 commit comments

Comments
 (0)