Add chain RPCs and getHeader. (#124)

* Add chain RPCs and getHeader.

Also:
- finish renaming transaction -> extrinsic;
- rejig development chain spec to be more useful.

* Fix.

* Remove invalid comments.

* Fix.
This commit is contained in:
Gav Wood
2018-04-13 14:21:32 +02:00
committed by Tomasz Drwięga
parent 002cacd26c
commit 727df04e57
2 changed files with 38 additions and 30 deletions
+37 -29
View File
@@ -123,7 +123,12 @@ impl network::TransactionPool for TransactionPoolAdapter {
}
}
fn poc_1_testnet_config() -> GenesisConfig {
pub struct ChainConfig {
genesis_config: GenesisConfig,
boot_nodes: Vec<String>,
}
fn poc_1_testnet_config() -> ChainConfig {
let initial_authorities = vec![
hex!["82c39b31a2b79a90f8e66e7a77fdb85a4ed5517f2ae39f6a80565e8ecae85cf5"].into(),
hex!["4de37a07567ebcbf8c64568428a835269a566723687058e017b6d69db00a77e7"].into(),
@@ -132,13 +137,12 @@ fn poc_1_testnet_config() -> GenesisConfig {
let endowed_accounts = vec![
hex!["24d132eb1a4cbf8e46de22652019f1e07fadd5037a6a057c75dbbfd4641ba85d"].into(),
];
GenesisConfig {
let genesis_config = GenesisConfig {
consensus: Some(ConsensusConfig {
code: include_bytes!("../../runtime/wasm/genesis.wasm").to_vec(), // TODO change
authorities: initial_authorities.clone(),
}),
system: None,
// block_time: 5, // 5 second block time.
session: Some(SessionConfig {
validators: initial_authorities.clone(),
session_length: 720, // that's 1 hour per session.
@@ -173,10 +177,12 @@ fn poc_1_testnet_config() -> GenesisConfig {
voting_period: 7 * 120 * 24, // 7 day voting period for council members.
}),
parachains: Some(Default::default()),
}
};
let boot_nodes = Vec::new();
ChainConfig { genesis_config, boot_nodes }
}
fn local_testnet_config() -> GenesisConfig {
fn local_testnet_config() -> ChainConfig {
let initial_authorities = vec![
ed25519::Pair::from_seed(b"Alice ").public().into(),
ed25519::Pair::from_seed(b"Bob ").public().into(),
@@ -189,53 +195,54 @@ fn local_testnet_config() -> GenesisConfig {
ed25519::Pair::from_seed(b"Eve ").public().into(),
ed25519::Pair::from_seed(b"Ferdie ").public().into(),
];
GenesisConfig {
let genesis_config = GenesisConfig {
consensus: Some(ConsensusConfig {
code: include_bytes!("../../runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm").to_vec(),
authorities: initial_authorities.clone(),
}),
system: None,
// block_time: 5, // 5 second block time.
session: Some(SessionConfig {
validators: initial_authorities.clone(),
session_length: 720, // that's 1 hour per session.
session_length: 10,
}),
staking: Some(StakingConfig {
current_era: 0,
intentions: vec![],
transaction_fee: 100,
transaction_fee: 1,
balances: endowed_accounts.iter().map(|&k|(k, 1u64 << 60)).collect(),
validator_count: 12,
sessions_per_era: 24, // 24 hours per era.
bonding_duration: 90, // 90 days per bond.
validator_count: 2,
sessions_per_era: 5,
bonding_duration: 2,
}),
democracy: Some(DemocracyConfig {
launch_period: 120 * 24 * 14, // 2 weeks per public referendum
voting_period: 120 * 24 * 28, // 4 weeks to discuss & vote on an active referendum
minimum_deposit: 1000, // 1000 as the minimum deposit for a referendum
launch_period: 9,
voting_period: 18,
minimum_deposit: 10,
}),
council: Some(CouncilConfig {
active_council: vec![],
candidacy_bond: 1000, // 1000 to become a council candidate
voter_bond: 100, // 100 down to vote for a candidate
present_slash_per_voter: 1, // slash by 1 per voter for an invalid presentation.
carry_count: 24, // carry over the 24 runners-up to the next council election
presentation_duration: 120 * 24, // one day for presenting winners.
approval_voting_period: 7 * 120 * 24, // one week period between possible council elections.
term_duration: 180 * 120 * 24, // 180 day term duration for the council.
desired_seats: 0, // start with no council: we'll raise this once the stake has been dispersed a bit.
inactive_grace_period: 1, // one addition vote should go by before an inactive voter can be reaped.
candidacy_bond: 10,
voter_bond: 2,
present_slash_per_voter: 1,
carry_count: 4,
presentation_duration: 10,
approval_voting_period: 20,
term_duration: 40,
desired_seats: 0,
inactive_grace_period: 1,
cooloff_period: 90 * 120 * 24, // 90 day cooling off period if council member vetoes a proposal.
voting_period: 7 * 120 * 24, // 7 day voting period for council members.
cooloff_period: 75,
voting_period: 20,
}),
parachains: Some(Default::default()),
}
};
let boot_nodes = Vec::new();
ChainConfig { genesis_config, boot_nodes }
}
impl Service {
/// Creates and register protocol with the network service
pub fn new(config: Configuration) -> Result<Service, error::Error> {
pub fn new(mut config: Configuration) -> Result<Service, error::Error> {
// Create client
let executor = polkadot_executor::Executor::new();
let mut storage = Default::default();
@@ -250,10 +257,11 @@ impl Service {
info!("Generated a new keypair: {:?}", key.public());
}
let genesis_config = match config.chain_spec {
let ChainConfig { genesis_config, boot_nodes } = match config.chain_spec {
ChainSpec::Development => local_testnet_config(),
ChainSpec::PoC1Testnet => poc_1_testnet_config(),
};
config.network.boot_nodes.extend(boot_nodes);
let prepare_genesis = || {
storage = genesis_config.build_externalities();