git.delta.rocks / unique-network / refs/commits / 73f8e683417f

difftreelog

Merge pull request #45 from usetech-llc/feature/chain_spec_token_vesting

str-mv2020-12-22parents: #cf6c066 #0032fbb.patch.diff
in: master
Add chain spec entries for system properties and vesting

3 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3522,6 +3522,8 @@
  "sc-rpc-api",
  "sc-service",
  "sc-transaction-pool",
+ "serde",
+ "serde_json",
  "sp-api",
  "sp-block-builder",
  "sp-blockchain",
modifiednode/Cargo.tomldiffbeforeafterboth
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -58,6 +58,9 @@
 substrate-frame-rpc-system = {version = '2.0.0', git = 'https://github.com/usetech-llc/substrate.git', branch = 'release_flexi'}
 pallet-contracts-rpc = {version = '0.8.0', git = 'https://github.com/usetech-llc/substrate.git', branch = 'release_flexi'} 
 
+serde = { version = "1.0.102", features = ["derive"] }
+serde_json = "1.0.41"
+
 [features]
 default = []
 runtime-benchmarks = ['nft-runtime/runtime-benchmarks']
modifiednode/src/chain_spec.rsdiffbeforeafterboth
before · node/src/chain_spec.rs
1// use nft_runtime::{2//     AccountId, AuraConfig, BalancesConfig, GenesisConfig, GrandpaConfig, Signature, SudoConfig,3//     SystemConfig, WASM_BINARY,4// };5// use nft_runtime::{ContractsConfig, ContractsSchedule, NftConfig, CollectionType};6use nft_runtime::*;7use sc_service::ChainType;8use sp_consensus_aura::sr25519::AuthorityId as AuraId;9use sp_core::{sr25519, Pair, Public};10use sp_finality_grandpa::AuthorityId as GrandpaId;11use sp_runtime::traits::{IdentifyAccount, Verify};1213// Note this is the URL for the telemetry server14//const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";1516/// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type.17pub type ChainSpec = sc_service::GenericChainSpec<GenesisConfig>;1819/// Helper function to generate a crypto pair from seed20pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {21    TPublic::Pair::from_string(&format!("//{}", seed), None)22        .expect("static values are valid; qed")23        .public()24}2526type AccountPublic = <Signature as Verify>::Signer;2728/// Helper function to generate an account ID from seed29pub fn get_account_id_from_seed<TPublic: Public>(seed: &str) -> AccountId30where31    AccountPublic: From<<TPublic::Pair as Pair>::Public>,32{33    AccountPublic::from(get_from_seed::<TPublic>(seed)).into_account()34}3536/// Helper function to generate an authority key for Aura37pub fn authority_keys_from_seed(s: &str) -> (AuraId, GrandpaId) {38    (get_from_seed::<AuraId>(s), get_from_seed::<GrandpaId>(s))39}4041pub fn development_config() -> Result<ChainSpec, String> {42	let wasm_binary = WASM_BINARY.ok_or("Development wasm binary not available".to_string())?;4344	Ok(ChainSpec::from_genesis(45		// Name46		"Development",47		// ID48		"dev",49		ChainType::Development,50		move || testnet_genesis(51			wasm_binary,52			// Initial PoA authorities53			vec![54				authority_keys_from_seed("Alice"),55			],56			// Sudo account57			get_account_id_from_seed::<sr25519::Public>("Alice"),58			// Pre-funded accounts59			vec![60				get_account_id_from_seed::<sr25519::Public>("Alice"),61				get_account_id_from_seed::<sr25519::Public>("Bob"),62				get_account_id_from_seed::<sr25519::Public>("Alice//stash"),63				get_account_id_from_seed::<sr25519::Public>("Bob//stash"),64			],65			true,66		),67		// Bootnodes68		vec![],69		// Telemetry70		None,71		// Protocol ID72		None,73		// Properties74		None,75		// Extensions76		None,77	))78}7980pub fn local_testnet_config() -> Result<ChainSpec, String> {81	let wasm_binary = WASM_BINARY.ok_or("Development wasm binary not available".to_string())?;8283	Ok(ChainSpec::from_genesis(84		// Name85		"Local Testnet",86		// ID87		"local_testnet",88		ChainType::Local,89		move || testnet_genesis(90			wasm_binary,91			// Initial PoA authorities92			vec![93				authority_keys_from_seed("Alice"),94				authority_keys_from_seed("Bob"),95			],96			// Sudo account97			get_account_id_from_seed::<sr25519::Public>("Alice"),98			// Pre-funded accounts99			vec![100				get_account_id_from_seed::<sr25519::Public>("Alice"),101				get_account_id_from_seed::<sr25519::Public>("Bob"),102				get_account_id_from_seed::<sr25519::Public>("Charlie"),103				get_account_id_from_seed::<sr25519::Public>("Dave"),104				get_account_id_from_seed::<sr25519::Public>("Eve"),105				get_account_id_from_seed::<sr25519::Public>("Ferdie"),106				get_account_id_from_seed::<sr25519::Public>("Alice//stash"),107				get_account_id_from_seed::<sr25519::Public>("Bob//stash"),108				get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),109				get_account_id_from_seed::<sr25519::Public>("Dave//stash"),110				get_account_id_from_seed::<sr25519::Public>("Eve//stash"),111				get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),112			],113			true,114		),115		// Bootnodes116		vec![],117		// Telemetry118		None,119		// Protocol ID120		None,121		// Properties122		None,123		// Extensions124		None,125	))126}127128fn testnet_genesis(129    wasm_binary: &[u8],130    initial_authorities: Vec<(AuraId, GrandpaId)>,131    root_key: AccountId,132    endowed_accounts: Vec<AccountId>,133    enable_println: bool,134) -> GenesisConfig {135    GenesisConfig {136        system: Some(SystemConfig {137            code: wasm_binary.to_vec(),138            changes_trie_config: Default::default(),139        }),140        pallet_balances: Some(BalancesConfig {141            balances: endowed_accounts142                .iter()143                .cloned()144                .map(|k| (k, 1 << 100))145                .collect(),146        }),147        pallet_aura: Some(AuraConfig {148            authorities: initial_authorities.iter().map(|x| (x.0.clone())).collect(),149        }),150		pallet_grandpa: Some(GrandpaConfig {151            authorities: initial_authorities152                .iter()153                .map(|x| (x.1.clone(), 1))154                .collect(),155		}),156		pallet_treasury: Some(Default::default()),157		pallet_sudo: Some(SudoConfig { key: root_key }),158		pallet_vesting: Some(Default::default()),159        pallet_nft: Some(NftConfig {160            collection: vec![(161                1,162                CollectionType {163                    owner: get_account_id_from_seed::<sr25519::Public>("Alice"),164                    mode: CollectionMode::NFT,165                    access: AccessMode::Normal,166                    decimal_points: 0,167                    name: vec![],168                    description: vec![],169                    token_prefix: vec![],170                    mint_mode: false,171					offchain_schema: vec![],172					schema_version: SchemaVersion::default(),173                    sponsor: get_account_id_from_seed::<sr25519::Public>("Alice"),174                    unconfirmed_sponsor: get_account_id_from_seed::<sr25519::Public>("Alice"),175                    const_on_chain_schema: vec![],176					variable_on_chain_schema: vec![],177					limits: CollectionLimits::default()178                },179            )],180            nft_item_id: vec![],181            fungible_item_id: vec![],182            refungible_item_id: vec![],183            chain_limit: ChainLimits {184                collection_numbers_limit: 100000,185                account_token_ownership_limit: 1000000,186                collections_admins_limit: 5,187                custom_data_limit: 2048,188                nft_sponsor_transfer_timeout: 15,189                fungible_sponsor_transfer_timeout: 15,190                refungible_sponsor_transfer_timeout: 15,191            },192        }),193        pallet_contracts: Some(ContractsConfig {194            current_schedule: ContractsSchedule {195                enable_println,196                ..Default::default()197            },198        }),199    }200}
after · node/src/chain_spec.rs
1// use nft_runtime::{2//     AccountId, AuraConfig, BalancesConfig, GenesisConfig, GrandpaConfig, Signature, SudoConfig,3//     SystemConfig, WASM_BINARY,4// };5// use nft_runtime::{ContractsConfig, ContractsSchedule, NftConfig, CollectionType};6use nft_runtime::*;7use sc_service::ChainType;8use sp_consensus_aura::sr25519::AuthorityId as AuraId;9use sp_core::{sr25519, Pair, Public};10use sp_finality_grandpa::AuthorityId as GrandpaId;11use sp_runtime::traits::{IdentifyAccount, Verify};12use serde_json::map::Map;1314// Note this is the URL for the telemetry server15//const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";1617/// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type.18pub type ChainSpec = sc_service::GenericChainSpec<GenesisConfig>;1920/// Helper function to generate a crypto pair from seed21pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {22    TPublic::Pair::from_string(&format!("//{}", seed), None)23        .expect("static values are valid; qed")24        .public()25}2627type AccountPublic = <Signature as Verify>::Signer;2829/// Helper function to generate an account ID from seed30pub fn get_account_id_from_seed<TPublic: Public>(seed: &str) -> AccountId31where32    AccountPublic: From<<TPublic::Pair as Pair>::Public>,33{34    AccountPublic::from(get_from_seed::<TPublic>(seed)).into_account()35}3637/// Helper function to generate an authority key for Aura38pub fn authority_keys_from_seed(s: &str) -> (AuraId, GrandpaId) {39    (get_from_seed::<AuraId>(s), get_from_seed::<GrandpaId>(s))40}4142pub fn development_config() -> Result<ChainSpec, String> {43	let wasm_binary = WASM_BINARY.ok_or("Development wasm binary not available".to_string())?;4445	let mut properties = Map::new();46	properties.insert("tokenSymbol".into(), "UniqueTest".into());47	properties.insert("tokenDecimals".into(), 15.into());48	properties.insert("ss58Format".into(), 0.into());4950	Ok(ChainSpec::from_genesis(51		// Name52		"Development",53		// ID54		"dev",55		ChainType::Development,56		move || testnet_genesis(57			wasm_binary,58			// Initial PoA authorities59			vec![60				authority_keys_from_seed("Alice"),61			],62			// Sudo account63			get_account_id_from_seed::<sr25519::Public>("Alice"),64			// Pre-funded accounts65			vec![66				get_account_id_from_seed::<sr25519::Public>("Alice"),67				get_account_id_from_seed::<sr25519::Public>("Bob"),68				get_account_id_from_seed::<sr25519::Public>("Alice//stash"),69				get_account_id_from_seed::<sr25519::Public>("Bob//stash"),70			],71			true,72		),73		// Bootnodes74		vec![],75		// Telemetry76		None,77		// Protocol ID78		None,79		// Properties80		Some(properties),81		// Extensions82		None,83	))84}8586pub fn local_testnet_config() -> Result<ChainSpec, String> {87	let wasm_binary = WASM_BINARY.ok_or("Development wasm binary not available".to_string())?;8889	Ok(ChainSpec::from_genesis(90		// Name91		"Local Testnet",92		// ID93		"local_testnet",94		ChainType::Local,95		move || testnet_genesis(96			wasm_binary,97			// Initial PoA authorities98			vec![99				authority_keys_from_seed("Alice"),100				authority_keys_from_seed("Bob"),101			],102			// Sudo account103			get_account_id_from_seed::<sr25519::Public>("Alice"),104			// Pre-funded accounts105			vec![106				get_account_id_from_seed::<sr25519::Public>("Alice"),107				get_account_id_from_seed::<sr25519::Public>("Bob"),108				get_account_id_from_seed::<sr25519::Public>("Charlie"),109				get_account_id_from_seed::<sr25519::Public>("Dave"),110				get_account_id_from_seed::<sr25519::Public>("Eve"),111				get_account_id_from_seed::<sr25519::Public>("Ferdie"),112				get_account_id_from_seed::<sr25519::Public>("Alice//stash"),113				get_account_id_from_seed::<sr25519::Public>("Bob//stash"),114				get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),115				get_account_id_from_seed::<sr25519::Public>("Dave//stash"),116				get_account_id_from_seed::<sr25519::Public>("Eve//stash"),117				get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),118			],119			true,120		),121		// Bootnodes122		vec![],123		// Telemetry124		None,125		// Protocol ID126		None,127		// Properties128		None,129		// Extensions130		None,131	))132}133134fn testnet_genesis(135    wasm_binary: &[u8],136    initial_authorities: Vec<(AuraId, GrandpaId)>,137    root_key: AccountId,138    endowed_accounts: Vec<AccountId>,139    enable_println: bool,140) -> GenesisConfig {141142	let vested_accounts = vec![143		get_account_id_from_seed::<sr25519::Public>("Bob"),144	];145146    GenesisConfig {147        system: Some(SystemConfig {148            code: wasm_binary.to_vec(),149            changes_trie_config: Default::default(),150        }),151        pallet_balances: Some(BalancesConfig {152            balances: endowed_accounts153                .iter()154                .cloned()155                .map(|k| (k, 1 << 100))156                .collect(),157        }),158        pallet_aura: Some(AuraConfig {159            authorities: initial_authorities.iter().map(|x| (x.0.clone())).collect(),160        }),161		pallet_grandpa: Some(GrandpaConfig {162            authorities: initial_authorities163                .iter()164                .map(|x| (x.1.clone(), 1))165                .collect(),166		}),167		pallet_treasury: Some(Default::default()),168		pallet_sudo: Some(SudoConfig { key: root_key }),169		pallet_vesting: Some(VestingConfig {170            vesting: vested_accounts171                .iter()172                .cloned()173                .map(|k| (k, 1000, 100, 1 << 98))174                .collect(),175        }),176        pallet_nft: Some(NftConfig {177            collection: vec![(178                1,179                CollectionType {180                    owner: get_account_id_from_seed::<sr25519::Public>("Alice"),181                    mode: CollectionMode::NFT,182                    access: AccessMode::Normal,183                    decimal_points: 0,184                    name: vec![],185                    description: vec![],186                    token_prefix: vec![],187                    mint_mode: false,188					offchain_schema: vec![],189					schema_version: SchemaVersion::default(),190                    sponsor: get_account_id_from_seed::<sr25519::Public>("Alice"),191                    unconfirmed_sponsor: get_account_id_from_seed::<sr25519::Public>("Alice"),192                    const_on_chain_schema: vec![],193					variable_on_chain_schema: vec![],194					limits: CollectionLimits::default()195                },196            )],197            nft_item_id: vec![],198            fungible_item_id: vec![],199            refungible_item_id: vec![],200            chain_limit: ChainLimits {201                collection_numbers_limit: 100000,202                account_token_ownership_limit: 1000000,203                collections_admins_limit: 5,204                custom_data_limit: 2048,205                nft_sponsor_transfer_timeout: 15,206                fungible_sponsor_transfer_timeout: 15,207                refungible_sponsor_transfer_timeout: 15,208            },209        }),210        pallet_contracts: Some(ContractsConfig {211            current_schedule: ContractsSchedule {212                enable_println,213                ..Default::default()214            },215        }),216    }217}