Skip to content

Commit c44a2be

Browse files
festelofestelo
committed
parachain update
1 parent cb3ccca commit c44a2be

File tree

156 files changed

+12949
-8041
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+12949
-8041
lines changed

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,16 @@ members = [
2020
'pallets/roaming/roaming-billing-policies',
2121
'pallets/roaming/roaming-charging-policies',
2222
'pallets/roaming/roaming-packet-bundles',
23-
'pallets/mining/mining-speed-boosts/configuration/token-mining',
24-
'pallets/mining/mining-speed-boosts/configuration/hardware-mining',
25-
'pallets/mining/mining-speed-boosts/rates/token-mining',
26-
'pallets/mining/mining-speed-boosts/rates/hardware-mining',
27-
'pallets/mining/mining-speed-boosts/sampling/token-mining',
28-
'pallets/mining/mining-speed-boosts/sampling/hardware-mining',
29-
'pallets/mining/mining-speed-boosts/eligibility/token-mining',
30-
'pallets/mining/mining-speed-boosts/eligibility/hardware-mining',
31-
'pallets/mining/mining-speed-boosts/lodgements/token-mining',
32-
'pallets/mining/mining-speed-boosts/lodgements/hardware-mining',
23+
'pallets/membership/supernodes',
24+
'pallets/mining/setting/token',
25+
'pallets/mining/setting/hardware',
26+
'pallets/mining/rates/token',
27+
'pallets/mining/rates/hardware',
28+
'pallets/mining/sampling/token',
29+
'pallets/mining/sampling/hardware',
30+
'pallets/mining/eligibility/token',
31+
'pallets/mining/eligibility/hardware',
32+
'pallets/mining/claims/token',
33+
'pallets/mining/claims/hardware',
3334
'runtime',
3435
]

‎node/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ branch = "rococo-v1"
152152
version = '3.0.0'
153153

154154
# Cumulus dependencies
155-
[dependencies.cumulus-client-consensus]
155+
[dependencies.cumulus-client-consensus-relay-chain]
156156
git = 'https://github.com/paritytech/cumulus.git'
157157
branch = "rococo-v1"
158158

‎node/src/chain_spec.rs‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -285,31 +285,31 @@ const INITIAL_DHX_DAO_TREASURY_UNLOCKED_RESERVES_BALANCE: u128 = 30_000_000_000_
285285

286286
fn mk_genesis(endowed_accounts: Vec<AccountId>, root_key: AccountId, parachain_id: ParaId) -> GenesisConfig {
287287
GenesisConfig {
288-
frame_system: Some(datahighway_runtime::SystemConfig {
288+
frame_system: datahighway_runtime::SystemConfig {
289289
code: datahighway_runtime::WASM_BINARY.expect("WASM binary was not build, please build it!").to_vec(),
290290
changes_trie_config: Default::default(),
291-
}),
292-
pallet_balances: Some(BalancesConfig {
291+
},
292+
pallet_balances: BalancesConfig {
293293
balances: endowed_accounts
294294
.iter()
295295
.cloned()
296296
.map(|x| (x, INITIAL_BALANCE))
297297
.into_iter()
298298
.map(|k| (k.0, INITIAL_DHX_DAO_TREASURY_UNLOCKED_RESERVES_BALANCE))
299299
.collect(),
300-
}),
301-
pallet_collective_Instance1: Some(Default::default()),
302-
pallet_membership_Instance1: Some(GeneralCouncilMembershipConfig {
300+
},
301+
pallet_collective_Instance1: Default::default(),
302+
pallet_membership_Instance1: GeneralCouncilMembershipConfig {
303303
members: vec![root_key.clone()],
304304
phantom: Default::default(),
305-
}),
306-
pallet_treasury: Some(Default::default()),
307-
pallet_sudo: Some(SudoConfig {
305+
},
306+
pallet_treasury: Default::default(),
307+
pallet_sudo: SudoConfig {
308308
key: root_key.clone(),
309-
}),
310-
parachain_info: Some(datahighway_runtime::ParachainInfoConfig {
309+
},
310+
parachain_info: datahighway_runtime::ParachainInfoConfig {
311311
parachain_id,
312-
}),
312+
},
313313
}
314314
}
315315

@@ -320,29 +320,29 @@ fn testnet_genesis(
320320
id: ParaId,
321321
) -> GenesisConfig {
322322
GenesisConfig {
323-
frame_system: Some(datahighway_runtime::SystemConfig {
323+
frame_system: datahighway_runtime::SystemConfig {
324324
code: datahighway_runtime::WASM_BINARY.expect("WASM binary was not build, please build it!").to_vec(),
325325
changes_trie_config: Default::default(),
326-
}),
327-
// pallet_indices: Some(IndicesConfig {
326+
},
327+
// pallet_indices: IndicesConfig {
328328
// indices: endowed_accounts.iter().enumerate().map(|(index, x)| (index as u32, (*x).clone())).collect(),
329-
// }),
330-
pallet_balances: Some(BalancesConfig {
329+
// },
330+
pallet_balances: BalancesConfig {
331331
balances: endowed_accounts
332332
.iter()
333333
.cloned()
334334
.map(|x| (x, INITIAL_BALANCE))
335335
.into_iter()
336336
.map(|k| (k.0, INITIAL_DHX_DAO_TREASURY_UNLOCKED_RESERVES_BALANCE))
337337
.collect(),
338-
}),
339-
// pallet_session: Some(SessionConfig {
338+
},
339+
// pallet_session: SessionConfig {
340340
// keys: initial_authorities
341341
// .iter()
342342
// .map(|x| (x.0.clone(), x.0.clone(), session_keys(x.2.clone(), x.3.clone())))
343343
// .collect::<Vec<_>>(),
344-
// }),
345-
// pallet_staking: Some(StakingConfig {
344+
// },
345+
// pallet_staking: StakingConfig {
346346
// validator_count: initial_authorities.len() as u32 * 2,
347347
// minimum_validator_count: initial_authorities.len() as u32,
348348
// stakers: initial_authorities
@@ -352,25 +352,25 @@ fn testnet_genesis(
352352
// invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(),
353353
// slash_reward_fraction: Perbill::from_percent(10),
354354
// ..Default::default()
355-
// }),
356-
pallet_sudo: Some(SudoConfig {
355+
// },
356+
pallet_sudo: SudoConfig {
357357
key: root_key.clone(),
358-
}),
359-
// pallet_babe: Some(BabeConfig {
358+
},
359+
// pallet_babe: BabeConfig {
360360
// authorities: vec![],
361-
// }),
362-
// pallet_grandpa: Some(GrandpaConfig {
361+
// },
362+
// pallet_grandpa: GrandpaConfig {
363363
// authorities: vec![],
364-
// }),
365-
pallet_collective_Instance1: Some(Default::default()),
366-
pallet_membership_Instance1: Some(GeneralCouncilMembershipConfig {
364+
// },
365+
pallet_collective_Instance1: Default::default(),
366+
pallet_membership_Instance1: GeneralCouncilMembershipConfig {
367367
members: vec![root_key.clone()],
368368
phantom: Default::default(),
369-
}),
370-
pallet_treasury: Some(Default::default()),
371-
parachain_info: Some(datahighway_runtime::ParachainInfoConfig {
369+
},
370+
pallet_treasury: Default::default(),
371+
parachain_info: datahighway_runtime::ParachainInfoConfig {
372372
parachain_id: id,
373-
}),
373+
},
374374
}
375375
}
376376

@@ -381,14 +381,14 @@ fn dev_genesis(
381381
id: ParaId,
382382
) -> datahighway_runtime::GenesisConfig {
383383
datahighway_runtime::GenesisConfig {
384-
frame_system: Some(datahighway_runtime::SystemConfig {
384+
frame_system: datahighway_runtime::SystemConfig {
385385
code: datahighway_runtime::WASM_BINARY.expect("WASM binary was not build, please build it!").to_vec(),
386386
changes_trie_config: Default::default(),
387-
}),
388-
// pallet_indices: Some(IndicesConfig {
387+
},
388+
// pallet_indices: IndicesConfig {
389389
// indices: endowed_accounts.iter().enumerate().map(|(index, x)| (index as u32, (*x).clone())).collect(),
390-
// }),
391-
pallet_balances: Some(datahighway_runtime::BalancesConfig {
390+
// },
391+
pallet_balances: datahighway_runtime::BalancesConfig {
392392
balances: endowed_accounts.iter().cloned().map(|x|
393393
// Insert Public key (hex) of the account without the 0x prefix below
394394
if x == UncheckedFrom::unchecked_from(hex!("a42b7518d62a942344fec55d414f1654bf3fd325dbfa32a3c30534d5976acb21").into()) {
@@ -398,14 +398,14 @@ fn dev_genesis(
398398
}
399399
)
400400
.collect(),
401-
}),
402-
// pallet_session: Some(SessionConfig {
401+
},
402+
// pallet_session: SessionConfig {
403403
// keys: initial_authorities
404404
// .iter()
405405
// .map(|x| (x.0.clone(), x.0.clone(), session_keys(x.2.clone(), x.3.clone())))
406406
// .collect::<Vec<_>>(),
407-
// }),
408-
// pallet_staking: Some(StakingConfig {
407+
// },
408+
// pallet_staking: StakingConfig {
409409
// validator_count: initial_authorities.len() as u32 * 2,
410410
// minimum_validator_count: initial_authorities.len() as u32,
411411
// stakers: initial_authorities
@@ -415,24 +415,24 @@ fn dev_genesis(
415415
// invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(),
416416
// slash_reward_fraction: Perbill::from_percent(10),
417417
// ..Default::default()
418-
// }),
419-
pallet_sudo: Some(datahighway_runtime::SudoConfig {
418+
// },
419+
pallet_sudo: datahighway_runtime::SudoConfig {
420420
key: root_key.clone(),
421-
}),
422-
// pallet_babe: Some(BabeConfig {
421+
},
422+
// pallet_babe: BabeConfig {
423423
// authorities: vec![],
424-
// }),
425-
// pallet_grandpa: Some(GrandpaConfig {
424+
// },
425+
// pallet_grandpa: GrandpaConfig {
426426
// authorities: vec![],
427-
// }),
428-
pallet_collective_Instance1: Some(Default::default()),
429-
pallet_membership_Instance1: Some(GeneralCouncilMembershipConfig {
427+
// },
428+
pallet_collective_Instance1: Default::default(),
429+
pallet_membership_Instance1: GeneralCouncilMembershipConfig {
430430
members: vec![root_key.clone()],
431431
phantom: Default::default(),
432-
}),
433-
pallet_treasury: Some(Default::default()),
434-
parachain_info: Some(datahighway_runtime::ParachainInfoConfig {
432+
},
433+
pallet_treasury: Default::default(),
434+
parachain_info: datahighway_runtime::ParachainInfoConfig {
435435
parachain_id: id,
436-
}),
436+
},
437437
}
438438
}

‎node/src/command.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ pub fn run() -> Result<()> {
276276

277277
let task_executor = config.task_executor.clone();
278278
let polkadot_config =
279-
SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, task_executor, None)
279+
SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, task_executor)
280280
.map_err(|err| format!("Relay chain argument error: {}", err))?;
281281
let collator = cli.run.base.validator || cli.collator;
282282

@@ -357,9 +357,9 @@ impl CliConfiguration<Self> for RelayChainCli {
357357
self.base.base.prometheus_config(default_listen_port)
358358
}
359359

360-
fn init<C: SubstrateCli>(&self) -> Result<sc_telemetry::TelemetryWorker> {
361-
unreachable!("PolkadotCli is never initialized; qed");
362-
}
360+
fn init<C: SubstrateCli>(&self) -> Result<()> {
361+
unreachable!("PolkadotCli is never initialized; qed");
362+
}
363363

364364
fn chain_id(&self, is_dev: bool) -> Result<String> {
365365
let chain_id = self.base.base.chain_id(is_dev)?;

0 commit comments

Comments
 (0)