Skip to content

Commit 8f41ba2

Browse files
authored
Merge pull request #21 from srlabs/upgrade-stable2503
stable2503 upgrade
2 parents 49a60ca + bc22dff commit 8f41ba2

File tree

6 files changed

+52
-50
lines changed

6 files changed

+52
-50
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ cargo
22
.cargo
33
target
44
output
5+
cargo_home

templates/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ resolver = "2"
99
members = [
1010
"kitchensink",
1111
"solochain",
12-
]
12+
]

templates/kitchensink/Cargo.toml

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,43 +5,43 @@ edition = "2021"
55
publish = false
66

77
[dependencies]
8-
ziggy = { version = "1.3.0", default-features = false }
9-
10-
kitchensink-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
11-
12-
codec = { version = "3.6.12", features = ["derive"], default-features = false, package = "parity-scale-codec" }
13-
14-
node-primitives = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
15-
16-
frame-support = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
17-
frame-system = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
18-
19-
sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
20-
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
21-
sp-state-machine = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
22-
sp-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
23-
sp-consensus-beefy = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
24-
sp-authority-discovery = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
25-
26-
pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
27-
pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
28-
pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
29-
pallet-staking = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
30-
pallet-im-online = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
31-
pallet-referenda = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
32-
pallet-contracts = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
33-
pallet-society = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
34-
pallet-lottery = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
35-
pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
36-
pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
37-
pallet-remark = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
38-
pallet-transaction-storage = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
39-
pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
40-
pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
41-
pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
42-
pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
43-
pallet-broker = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
44-
pallet-revive = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
8+
ziggy = {version = "1.3.1", default-features = false}
9+
10+
kitchensink-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
11+
12+
codec = { version = "3.7.4", features = ["derive"], default-features = false, package = "parity-scale-codec" }
13+
14+
node-primitives = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
15+
16+
frame-support = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
17+
frame-system = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
18+
19+
sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
20+
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
21+
sp-state-machine = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
22+
sp-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
23+
sp-consensus-beefy = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
24+
sp-authority-discovery = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
25+
26+
pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
27+
pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
28+
pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
29+
pallet-staking = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
30+
pallet-im-online = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
31+
pallet-referenda = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
32+
pallet-contracts = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
33+
pallet-society = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
34+
pallet-lottery = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
35+
pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
36+
pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
37+
pallet-remark = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
38+
pallet-transaction-storage = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
39+
pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
40+
pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
41+
pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
42+
pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
43+
pallet-broker = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
44+
pallet-revive = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
4545

4646
[features]
4747
default = ["std", "try-runtime"]

templates/kitchensink/src/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ fn generate_genesis(accounts: &[AccountId]) -> Storage {
7474
system: SystemConfig::default(),
7575
balances: BalancesConfig {
7676
balances: accounts.iter().cloned().map(|x| (x, ENDOWMENT)).collect(),
77+
dev_accounts: None,
7778
},
7879
indices: IndicesConfig { indices: vec![] },
7980
session: SessionConfig {

templates/solochain/Cargo.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ edition = "2021"
55
publish = false
66

77
[dependencies]
8-
ziggy = { version = "1.3.0", default-features = false }
8+
ziggy = { version = "1.3.1", default-features = false }
99

10-
solochain-template-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
10+
solochain-template-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
1111

12-
codec = { version = "3.6.12", features = ["derive", "max-encoded-len"], default-features = false, package = "parity-scale-codec" }
12+
codec = { version = "3.7.4", features = ["derive", "max-encoded-len"], default-features = false, package = "parity-scale-codec" }
1313

14-
frame-support = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
15-
frame-system = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
14+
frame-support = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
15+
frame-system = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
1616

17-
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
18-
sp-state-machine = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
19-
sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
17+
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
18+
sp-state-machine = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
19+
sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
2020

21-
pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
22-
pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
23-
pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-1", default-features = false }
21+
pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
22+
pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
23+
pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503", default-features = false }
2424

2525
[features]
2626
default = ["std", "try-runtime"]

templates/solochain/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ fn generate_genesis(accounts: &[AccountId]) -> Storage {
4747

4848
RuntimeGenesisConfig {
4949
system: SystemConfig::default(),
50-
balances: BalancesConfig { balances },
50+
balances: BalancesConfig { balances, dev_accounts: None },
5151
aura: AuraConfig { authorities },
5252
grandpa: GrandpaConfig::default(),
5353
sudo: SudoConfig { key: None }, // Assign no network admin rights.

0 commit comments

Comments
 (0)