Skip to content

Commit 0b333e3

Browse files
enddynaynEnddy Dumbrique
enddynayn
and
Enddy Dumbrique
authored
chore(upgrade): v1.3.0 to v1.4.0 (#2024)
Upgrade Polkadot-sdk to v1.4.0. - [Polkadot-sdk release notes](https://github.com/paritytech/polkadot-sdk/releases/tag/polkadot-v1.4.0) - Update weights Closes #1807 Co-authored-by: Enddy Dumbrique <[email protected]>
1 parent 8c61e52 commit 0b333e3

31 files changed

+2134
-1638
lines changed

‎Cargo.lock

Lines changed: 962 additions & 538 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 & 98 deletions
Large diffs are not rendered by default.

‎node/service/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jsonrpsee = { workspace = true, features = ["server"] }
2121
log = { workspace = true }
2222
serde = { workspace = true, features = ["derive"] }
2323
tokio = { workspace = true, features = ["macros", "time", "parking_lot"] }
24+
serde_json = { workspace = true }
2425

2526
# Frequency Runtime
2627
frequency-runtime = { path = "../../runtime/frequency", optional = true }

‎node/service/src/chain_spec/frequency.rs

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,23 @@ pub fn benchmark_mainnet_config() -> ChainSpec {
121121
let properties =
122122
get_properties(FREQUENCY_TOKEN, TOKEN_DECIMALS as u32, Ss58Prefix::get().into());
123123
let para_id: ParaId = 2091.into();
124-
ChainSpec::from_genesis(
125-
// Name
124+
ChainSpec::builder(
125+
frequency_runtime::wasm_binary_unwrap(),
126+
Extensions { relay_chain: "polkadot".into(), para_id: para_id.into() },
127+
).with_name(
126128
"Frequency",
127-
// ID
129+
).with_protocol_id(
128130
"frequency",
129-
ChainType::Live,
130-
move || {
131+
).with_properties(
132+
properties,
133+
).with_chain_type(
134+
ChainType::Live
135+
).with_telemetry_endpoints(
136+
TelemetryEndpoints::new(vec![("wss://telemetry.polkadot.io/submit/".into(), 0), ("wss://telemetry.frequency.xyz/submit/".into(), 0)]).unwrap()
137+
).with_boot_nodes(vec![
138+
"/dns4/0.boot.frequency.xyz/tcp/30333/ws/p2p/12D3KooWBd4aEArNvXECtt2JHQACBdFmeafpyfre3q81iM1xCcpP".parse().unwrap(),
139+
"/dns4/1.boot.frequency.xyz/tcp/30333/ws/p2p/12D3KooWCW8d7Yz2d3Jcb49rWcNppRNEs1K2NZitCpPtrHSQb6dw".parse().unwrap(),
140+
]).with_genesis_config(
131141
frequency_genesis(
132142
vec![
133143
(
@@ -389,41 +399,21 @@ pub fn benchmark_mainnet_config() -> ChainSpec {
389399
100_000 * UNITS,
390400
para_id,
391401
)
392-
},
393-
// Bootnodes
394-
vec![
395-
"/dns4/0.boot.frequency.xyz/tcp/30333/ws/p2p/12D3KooWBd4aEArNvXECtt2JHQACBdFmeafpyfre3q81iM1xCcpP".parse().unwrap(),
396-
"/dns4/1.boot.frequency.xyz/tcp/30333/ws/p2p/12D3KooWCW8d7Yz2d3Jcb49rWcNppRNEs1K2NZitCpPtrHSQb6dw".parse().unwrap(),
397-
],
398-
// Telemetry
399-
TelemetryEndpoints::new(vec![("wss://telemetry.polkadot.io/submit/".into(), 0), ("wss://telemetry.frequency.xyz/submit/".into(), 0)]).ok(),
400-
// Protocol ID
401-
Some("frequency"),
402-
// Fork ID
403-
None,
404-
// Properties
405-
Some(properties),
406-
// Extensions
407-
Extensions { relay_chain: "polkadot".into(), para_id: para_id.into() },
408-
)
402+
403+
).build()
409404
}
410405

411-
#[allow(clippy::expect_used)]
406+
#[allow(clippy::unwrap_used)]
412407
fn frequency_genesis(
413408
initial_authorities: Vec<(AccountId, AuraId)>,
414409
endowed_accounts: Vec<(AccountId, Balance)>,
415410
council_members: Vec<AccountId>,
416411
technical_committee_members: Vec<AccountId>,
417412
candidacy_bond: Balance,
418413
id: ParaId,
419-
) -> frequency_runtime::RuntimeGenesisConfig {
420-
frequency_runtime::RuntimeGenesisConfig {
421-
system: frequency_runtime::SystemConfig {
422-
code: frequency_runtime::WASM_BINARY
423-
.expect("WASM binary was not build, please build it!")
424-
.to_vec(),
425-
..Default::default()
426-
},
414+
) -> serde_json::Value {
415+
let genesis = frequency_runtime::RuntimeGenesisConfig {
416+
system: frequency_runtime::SystemConfig { ..Default::default() },
427417
balances: frequency_runtime::BalancesConfig { balances: endowed_accounts },
428418
parachain_info: frequency_runtime::ParachainInfoConfig {
429419
parachain_id: id,
@@ -461,5 +451,7 @@ fn frequency_genesis(
461451
phantom: Default::default(),
462452
members: technical_committee_members,
463453
},
464-
}
454+
};
455+
456+
serde_json::to_value(&genesis).unwrap()
465457
}

‎node/service/src/chain_spec/frequency_dev.rs

Lines changed: 59 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -20,74 +20,63 @@ pub fn development_config() -> ChainSpec {
2020
let properties =
2121
get_properties(FREQUENCY_LOCAL_TOKEN, TOKEN_DECIMALS as u32, Ss58Prefix::get().into());
2222

23-
ChainSpec::from_genesis(
24-
// Name
25-
"Frequency Development (No Relay)",
26-
// ID
27-
"dev",
28-
ChainType::Development,
29-
move || {
30-
development_genesis(
31-
// initial collators.
32-
vec![
33-
(
34-
get_account_id_from_seed::<sr25519::Public>("Alice"),
35-
get_collator_keys_from_seed("Alice"),
36-
),
37-
(
38-
get_account_id_from_seed::<sr25519::Public>("Bob"),
39-
get_collator_keys_from_seed("Bob"),
40-
),
41-
],
42-
// Sudo
43-
Some(get_account_id_from_seed::<sr25519::Public>("Alice")),
44-
// Endowed Accounts
45-
vec![
46-
get_account_id_from_seed::<sr25519::Public>("Alice"),
47-
get_account_id_from_seed::<sr25519::Public>("Bob"),
48-
get_account_id_from_seed::<sr25519::Public>("Charlie"),
49-
get_account_id_from_seed::<sr25519::Public>("Dave"),
50-
get_account_id_from_seed::<sr25519::Public>("Eve"),
51-
get_account_id_from_seed::<sr25519::Public>("Ferdie"),
52-
get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
53-
get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
54-
get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
55-
get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
56-
get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
57-
get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
58-
common_runtime::constants::TREASURY_PALLET_ID.into_account_truncating(),
59-
],
60-
// Council members
61-
vec![
62-
get_account_id_from_seed::<sr25519::Public>("Alice"),
63-
get_account_id_from_seed::<sr25519::Public>("Charlie"),
64-
get_account_id_from_seed::<sr25519::Public>("Eve"),
65-
],
66-
// Technical Committee members
67-
vec![
68-
get_account_id_from_seed::<sr25519::Public>("Bob"),
69-
get_account_id_from_seed::<sr25519::Public>("Dave"),
70-
],
71-
// ParaId
72-
1000.into(),
73-
)
74-
},
75-
// Bootnodes
76-
Vec::new(),
77-
// Telemetry
78-
None,
79-
// Protocol ID
80-
Some("dev"),
81-
// Fork ID
82-
None,
83-
// Properties
84-
Some(properties),
85-
// Extensions
23+
ChainSpec::builder(
24+
frequency_runtime::wasm_binary_unwrap(),
8625
Extensions {
8726
relay_chain: "dev".into(), // You MUST set this to the correct network!
8827
para_id: 1000,
8928
},
9029
)
30+
.with_name("Frequency Development (No Relay)")
31+
.with_id("dev")
32+
.with_properties(properties)
33+
.with_chain_type(ChainType::Development)
34+
.with_protocol_id("dev")
35+
.with_genesis_config(development_genesis(
36+
// initial collators.
37+
vec![
38+
(
39+
get_account_id_from_seed::<sr25519::Public>("Alice"),
40+
get_collator_keys_from_seed("Alice"),
41+
),
42+
(
43+
get_account_id_from_seed::<sr25519::Public>("Bob"),
44+
get_collator_keys_from_seed("Bob"),
45+
),
46+
],
47+
// Sudo
48+
Some(get_account_id_from_seed::<sr25519::Public>("Alice")),
49+
// Endowed Accounts
50+
vec![
51+
get_account_id_from_seed::<sr25519::Public>("Alice"),
52+
get_account_id_from_seed::<sr25519::Public>("Bob"),
53+
get_account_id_from_seed::<sr25519::Public>("Charlie"),
54+
get_account_id_from_seed::<sr25519::Public>("Dave"),
55+
get_account_id_from_seed::<sr25519::Public>("Eve"),
56+
get_account_id_from_seed::<sr25519::Public>("Ferdie"),
57+
get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
58+
get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
59+
get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
60+
get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
61+
get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
62+
get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
63+
common_runtime::constants::TREASURY_PALLET_ID.into_account_truncating(),
64+
],
65+
// Council members
66+
vec![
67+
get_account_id_from_seed::<sr25519::Public>("Alice"),
68+
get_account_id_from_seed::<sr25519::Public>("Charlie"),
69+
get_account_id_from_seed::<sr25519::Public>("Eve"),
70+
],
71+
// Technical Committee members
72+
vec![
73+
get_account_id_from_seed::<sr25519::Public>("Bob"),
74+
get_account_id_from_seed::<sr25519::Public>("Dave"),
75+
],
76+
// ParaId
77+
1000.into(),
78+
))
79+
.build()
9180
}
9281

9382
/// Generate the session keys from individual elements.
@@ -97,22 +86,17 @@ fn template_session_keys(keys: AuraId) -> frequency_runtime::SessionKeys {
9786
frequency_runtime::SessionKeys { aura: keys }
9887
}
9988

100-
#[allow(clippy::expect_used)]
89+
#[allow(clippy::unwrap_used)]
10190
fn development_genesis(
10291
invulnerables: Vec<(AccountId, AuraId)>,
10392
root_key: Option<AccountId>,
10493
endowed_accounts: Vec<AccountId>,
10594
council_members: Vec<AccountId>,
10695
technical_committee_members: Vec<AccountId>,
10796
id: ParaId,
108-
) -> frequency_runtime::RuntimeGenesisConfig {
109-
frequency_runtime::RuntimeGenesisConfig {
110-
system: frequency_runtime::SystemConfig {
111-
code: frequency_runtime::WASM_BINARY
112-
.expect("WASM binary was not build, please build it!")
113-
.to_vec(),
114-
..Default::default()
115-
},
97+
) -> serde_json::Value {
98+
let genesis = frequency_runtime::RuntimeGenesisConfig {
99+
system: Default::default(),
116100
balances: frequency_runtime::BalancesConfig {
117101
balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 60)).collect(),
118102
},
@@ -156,5 +140,7 @@ fn development_genesis(
156140
phantom: Default::default(),
157141
members: technical_committee_members,
158142
},
159-
}
143+
};
144+
145+
serde_json::to_value(&genesis).unwrap()
160146
}

0 commit comments

Comments
 (0)