Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds H160 account #78

Merged
merged 27 commits into from
Nov 12, 2020
Merged

Adds H160 account #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7c9426b
Adds H160 account
Oct 22, 2020
8764da2
Check in Cargo.lock
JoshOrndorff Oct 22, 2020
16f2b9e
Fix no_std build
JoshOrndorff Oct 22, 2020
7411b78
Fixes token-dealer account id
Oct 22, 2020
69081fe
Setup chain_specs for H160 AccountId
Oct 23, 2020
ad44554
Adds license
Oct 23, 2020
65e1ce9
Cleans H160 account.rs
Oct 27, 2020
bfd3f68
Clean warnings
Oct 27, 2020
bbb6c3b
Fixes account reference
Oct 28, 2020
45e3627
Merge branch 'master' into crystalin-h160
Oct 28, 2020
0ee9558
Merge branch 'crystalin-h160' of github.com:purestake/moonbeam into c…
Oct 28, 2020
f1ae14b
Merge branch 'master' into crystalin-h160
Oct 28, 2020
16f3591
format rust files
Oct 29, 2020
e225452
More rust format fixes
Oct 29, 2020
e8e5c4b
Fixes genesis spec for H160
Oct 29, 2020
7c4a0de
Adds test for polkadotjs balance check
Nov 2, 2020
9a160d0
Fixes test specs
Nov 2, 2020
098f646
Restore AccountId logic
Nov 3, 2020
5f9bcdd
Replace AccountId20 by H160 + fix tests
Nov 3, 2020
292dba4
Clean formatting
Nov 4, 2020
8bb114d
Fix extra whitespace
Nov 4, 2020
8de56c2
Merge branch 'master' into crystalin-h160
Nov 11, 2020
3adec9b
Fixes warning messages
Nov 11, 2020
adc9ff3
Merge branch 'master' into crystalin-h160
Nov 11, 2020
a8a7771
Fixes errors in merge
Nov 11, 2020
6aac9d1
Merge branch 'master' into crystalin-h160
Nov 12, 2020
668426a
Adds dev/ops account to alphanet specs
Nov 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 5 additions & 34 deletions node/parachain/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,18 @@

use cumulus_primitives::ParaId;
use moonbeam_runtime::{
AccountId, BalancesConfig, GenesisConfig, Signature, SudoConfig, SystemConfig,
ParachainInfoConfig, WASM_BINARY, EthereumChainIdConfig, EVMConfig, EthereumConfig,
AccountId, BalancesConfig, GenesisConfig, SudoConfig, SystemConfig,
ParachainInfoConfig, WASM_BINARY, EthereumChainIdConfig, EVMConfig, EthereumConfig
};
use sc_chain_spec::{ChainSpecExtension, ChainSpecGroup};
use sc_service::ChainType;
use serde::{Deserialize, Serialize};
use sp_core::{sr25519, Pair, Public};
use sp_runtime::traits::{IdentifyAccount, Verify};
use std::collections::BTreeMap;
use std::str::FromStr;

/// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type.
pub type ChainSpec = sc_service::GenericChainSpec<GenesisConfig, Extensions>;

/// Helper function to generate a crypto pair from seed
pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
TPublic::Pair::from_string(&format!("//{}", seed), None)
.expect("static values are valid; qed")
.public()
}

/// The extensions for the [`ChainSpec`].
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, ChainSpecGroup, ChainSpecExtension)]
#[serde(deny_unknown_fields)]
Expand All @@ -53,16 +45,6 @@ impl Extensions {
}
}

type AccountPublic = <Signature as Verify>::Signer;

/// Helper function to generate an account ID from seed
pub fn get_account_id_from_seed<TPublic: Public>(seed: &str) -> AccountId
where
AccountPublic: From<<TPublic::Pair as Pair>::Public>,
{
AccountPublic::from(get_from_seed::<TPublic>(seed)).into_account()
}

pub fn get_chain_spec(para_id: ParaId) -> Result<ChainSpec, String> {
let wasm_binary = WASM_BINARY.ok_or("Development wasm binary not available".to_string())?;
Ok(ChainSpec::from_genesis(
Expand All @@ -72,20 +54,9 @@ pub fn get_chain_spec(para_id: ParaId) -> Result<ChainSpec, String> {
move || {
testnet_genesis(
wasm_binary,
get_account_id_from_seed::<sr25519::Public>("Alice"),
AccountId::from_str("6Be02d1d3665660d22FF9624b7BE0551ee1Ac91b").unwrap(),
vec![
get_account_id_from_seed::<sr25519::Public>("Alice"),
get_account_id_from_seed::<sr25519::Public>("Bob"),
get_account_id_from_seed::<sr25519::Public>("Charlie"),
get_account_id_from_seed::<sr25519::Public>("Dave"),
get_account_id_from_seed::<sr25519::Public>("Eve"),
get_account_id_from_seed::<sr25519::Public>("Ferdie"),
get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
AccountId::from_str("6Be02d1d3665660d22FF9624b7BE0551ee1Ac91b").unwrap(),
],
para_id,
1280, //ChainId
Expand Down
Loading