diff --git a/polkadot/cli/src/cli.yml b/polkadot/cli/src/cli.yml index 81ea904959..3f37d79239 100644 --- a/polkadot/cli/src/cli.yml +++ b/polkadot/cli/src/cli.yml @@ -65,6 +65,6 @@ args: - chain: long: chain value_name: CHAIN_SPEC - help: Specify the chain specification (one of dev, local or poc-1) + help: Specify the chain specification (one of dev, local or poc-2) takes_value: true subcommands: diff --git a/polkadot/cli/src/lib.rs b/polkadot/cli/src/lib.rs index d26ebf7556..90b0655cd4 100644 --- a/polkadot/cli/src/lib.rs +++ b/polkadot/cli/src/lib.rs @@ -110,7 +110,7 @@ impl substrate_rpc::system::SystemApi for Configuration { Ok(match self.0.chain_spec { ChainSpec::Development => "dev", ChainSpec::LocalTestnet => "local", - ChainSpec::PoC1Testnet => "poc-1", + ChainSpec::PoC2Testnet => "poc-2", }.into()) } } @@ -174,14 +174,14 @@ pub fn run(args: I) -> error::Result<()> where match matches.value_of("chain") { Some("dev") => config.chain_spec = ChainSpec::Development, Some("local") => config.chain_spec = ChainSpec::LocalTestnet, - Some("poc-1") => config.chain_spec = ChainSpec::PoC1Testnet, + Some("poc-2") => config.chain_spec = ChainSpec::PoC2Testnet, None => (), Some(unknown) => panic!("Invalid chain name: {}", unknown), } info!("Chain specification: {}", match config.chain_spec { ChainSpec::Development => "Development", ChainSpec::LocalTestnet => "Local Testnet", - ChainSpec::PoC1Testnet => "PoC-1 Testnet", + ChainSpec::PoC2Testnet => "PoC-2 Testnet", }); config.roles = role; diff --git a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm index 35f1cfd18b..e340c3df12 100644 Binary files a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm and b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm differ diff --git a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm index 7bc43f97d5..e081e7ca2b 100755 Binary files a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm and b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm differ diff --git a/polkadot/service/src/config.rs b/polkadot/service/src/config.rs index 16b39631b9..c6edbe141c 100644 --- a/polkadot/service/src/config.rs +++ b/polkadot/service/src/config.rs @@ -28,8 +28,8 @@ pub enum ChainSpec { Development, /// Whatever the current runtime is, with simple Alice/Bob auths. LocalTestnet, - /// The PoC-1 testnet. - PoC1Testnet, + /// The PoC-2 testnet. + PoC2Testnet, } /// Service configuration. diff --git a/polkadot/service/src/lib.rs b/polkadot/service/src/lib.rs index 5113193a36..436479d0a5 100644 --- a/polkadot/service/src/lib.rs +++ b/polkadot/service/src/lib.rs @@ -141,7 +141,7 @@ pub struct ChainConfig { boot_nodes: Vec, } -fn poc_1_testnet_config() -> ChainConfig { +fn poc_2_testnet_config() -> ChainConfig { let initial_authorities = vec![ hex!["82c39b31a2b79a90f8e66e7a77fdb85a4ed5517f2ae39f6a80565e8ecae85cf5"].into(), hex!["4de37a07567ebcbf8c64568428a835269a566723687058e017b6d69db00a77e7"].into(), @@ -164,7 +164,8 @@ fn poc_1_testnet_config() -> ChainConfig { staking: Some(StakingConfig { current_era: 0, intentions: initial_authorities.clone(), - transaction_fee: 100, + transaction_base_fee: 100, + transaction_byte_fee: 1, balances: endowed_accounts.iter().map(|&k|(k, 1u128 << 60)).collect(), validator_count: 12, sessions_per_era: 24, // 24 hours per era. @@ -222,7 +223,8 @@ fn testnet_config(initial_authorities: Vec) -> ChainConfig { staking: Some(StakingConfig { current_era: 0, intentions: initial_authorities.clone(), - transaction_fee: 1, + transaction_base_fee: 1, + transaction_byte_fee: 0, balances: endowed_accounts.iter().map(|&k|(k, (1u128 << 60))).collect(), validator_count: 2, sessions_per_era: 5, @@ -364,7 +366,7 @@ impl Service let ChainConfig { genesis_config, boot_nodes } = match config.chain_spec { ChainSpec::Development => development_config(), ChainSpec::LocalTestnet => local_testnet_config(), - ChainSpec::PoC1Testnet => poc_1_testnet_config(), + ChainSpec::PoC2Testnet => poc_2_testnet_config(), }; config.network.boot_nodes.extend(boot_nodes);