diff --git a/polkadot/api/src/lib.rs b/polkadot/api/src/lib.rs index e178f1d547..bf747624c3 100644 --- a/polkadot/api/src/lib.rs +++ b/polkadot/api/src/lib.rs @@ -31,9 +31,6 @@ extern crate substrate_state_machine as state_machine; #[macro_use] extern crate error_chain; -#[macro_use] -extern crate log; - #[cfg(test)] extern crate substrate_keyring as keyring; @@ -42,7 +39,7 @@ use client::Client; use polkadot_executor::Executor as LocalDispatch; use substrate_executor::{NativeExecutionDispatch, NativeExecutor}; use state_machine::OverlayedChanges; -use primitives::{AccountId, BlockId, Index, SessionKey, Timestamp}; +use primitives::{AccountId, BlockId, Hash, Index, SessionKey, Timestamp}; use primitives::parachain::DutyRoster; use runtime::{Block, Header, UncheckedExtrinsic, Extrinsic, Call, TimestampCall}; @@ -126,6 +123,9 @@ pub trait PolkadotApi { /// Get validators at a given block. fn validators(&self, at: &Self::CheckedBlockId) -> Result>; + /// Get the value of the randomness beacon at a given block. + fn random_seed(&self, at: &Self::CheckedBlockId) -> Result; + /// Get the authority duty roster at a block. fn duty_roster(&self, at: &Self::CheckedBlockId) -> Result; @@ -191,6 +191,10 @@ impl PolkadotApi for Client> with_runtime!(self, at, ::runtime::Session::validators) } + fn random_seed(&self, at: &CheckedId) -> Result { + with_runtime!(self, at, ::runtime::System::random_seed) + } + fn duty_roster(&self, at: &CheckedId) -> Result { // duty roster can only be queried at the start of a block, // so we create a dummy. diff --git a/polkadot/cli/src/cli.yml b/polkadot/cli/src/cli.yml index 07d3c0ec66..191d5bb4b2 100644 --- a/polkadot/cli/src/cli.yml +++ b/polkadot/cli/src/cli.yml @@ -56,6 +56,6 @@ args: - chain: long: chain value_name: CHAIN_SPEC - help: Specify the chain specification (one of dev or poc-1) + help: Specify the chain specification (one of dev, local or poc-1) takes_value: true subcommands: diff --git a/polkadot/cli/src/lib.rs b/polkadot/cli/src/lib.rs index d10fdfd32b..f09324f696 100644 --- a/polkadot/cli/src/lib.rs +++ b/polkadot/cli/src/lib.rs @@ -126,13 +126,15 @@ pub fn run(args: I) -> error::Result<()> where } match matches.value_of("chain") { - Some("poc-1") => config.chain_spec = ChainSpec::PoC1Testnet, Some("dev") => config.chain_spec = ChainSpec::Development, + Some("local") => config.chain_spec = ChainSpec::LocalTestnet, + Some("poc-1") => config.chain_spec = ChainSpec::PoC1Testnet, None => (), Some(unknown) => panic!("Invalid chain name: {}", unknown), } info!("Chain specification: {}", match config.chain_spec { - ChainSpec::Development => "Local Development", + ChainSpec::Development => "Development", + ChainSpec::LocalTestnet => "Local Testnet", ChainSpec::PoC1Testnet => "PoC-1 Testnet", }); diff --git a/polkadot/consensus/src/lib.rs b/polkadot/consensus/src/lib.rs index 2fef41c2d4..2630bea720 100644 --- a/polkadot/consensus/src/lib.rs +++ b/polkadot/consensus/src/lib.rs @@ -495,6 +495,7 @@ impl bft::ProposerFactory for ProposerFactory let checked_id = self.client.check_id(BlockId::Hash(parent_hash))?; let duty_roster = self.client.duty_roster(&checked_id)?; + let random_seed = self.client.random_seed(&checked_id)?; let group_info = make_group_info(duty_roster, authorities)?; let table = Arc::new(SharedTable::new(group_info, sign_with.clone(), parent_hash)); @@ -510,6 +511,7 @@ impl bft::ProposerFactory for ProposerFactory parent_hash, parent_number: parent_header.number, parent_id: checked_id, + random_seed, local_key: sign_with, client: self.client.clone(), transaction_pool: self.transaction_pool.clone(), @@ -533,6 +535,7 @@ pub struct Proposer { parent_hash: HeaderHash, parent_number: BlockNumber, parent_id: C::CheckedBlockId, + random_seed: Hash, client: Arc, local_key: Arc, transaction_pool: Arc>, @@ -561,6 +564,7 @@ impl bft::Proposer for Proposer { let mut pool = self.transaction_pool.lock(); let mut unqueue_invalid = Vec::new(); let mut pending_size = 0; + pool.cull(None, readiness_evaluator.clone()); for pending in pool.pending(readiness_evaluator.clone()) { // skip and cull transactions which are too large. if pending.encoded_size() > MAX_TRANSACTIONS_SIZE { @@ -624,6 +628,16 @@ impl bft::Proposer for Proposer { Box::new(self.delay.clone().map_err(Error::from).and_then(move |_| evaluated)) } + fn round_proposer(&self, round_number: usize, authorities: &[AuthorityId]) -> AuthorityId { + use primitives::uint::U256; + + let len: U256 = authorities.len().into(); + let offset = U256::from_big_endian(&self.random_seed.0) % len; + let offset = offset.low_u64() as usize + round_number; + + authorities[offset % authorities.len()].clone() + } + fn import_misbehavior(&self, misbehavior: Vec<(AuthorityId, bft::Misbehavior)>) { use bft::generic::Misbehavior as GenericMisbehavior; use primitives::bft::{MisbehaviorKind, MisbehaviorReport}; @@ -634,6 +648,7 @@ impl bft::Proposer for Proposer { let mut next_index = { let readiness_evaluator = Ready::create(self.parent_id.clone(), &*self.client); + pool.cull(None, readiness_evaluator.clone()); let cur_index = pool.pending(readiness_evaluator) .filter(|tx| tx.as_ref().as_ref().signed == local_id) .last() diff --git a/polkadot/runtime/src/lib.rs b/polkadot/runtime/src/lib.rs index a75fadd410..f933085d51 100644 --- a/polkadot/runtime/src/lib.rs +++ b/polkadot/runtime/src/lib.rs @@ -27,6 +27,10 @@ extern crate substrate_runtime_support as runtime_support; #[macro_use] extern crate substrate_runtime_primitives as runtime_primitives; +#[cfg(feature = "std")] +#[macro_use] +extern crate hex_literal; + #[cfg(test)] extern crate substrate_serializer; @@ -298,4 +302,24 @@ mod tests { println!("{}", HexDisplay::from(&v)); assert_eq!(UncheckedExtrinsic::decode(&mut &v[..]).unwrap(), tx); } + + #[test] + fn serialize_checked() { + let xt = Extrinsic { + signed: hex!["0d71d1a9cad6f2ab773435a7dec1bac019994d05d1dd5eb3108211dcf25c9d1e"], + index: 0u64, + function: Call::CouncilVoting(council::voting::Call::propose(Box::new( + PrivCall::Consensus(consensus::PrivCall::set_code( + vec![] + )) + ))), + }; + let v = Slicable::encode(&xt); + + let data = hex!["e00000000d71d1a9cad6f2ab773435a7dec1bac019994d05d1dd5eb3108211dcf25c9d1e000000000000000007000000000000006369D39D892B7B87A6769F90E14C618C2B84EBB293E2CC46640136E112C078C75619AC2E0815F2511568736623C055156C8FC427CE2AEE4AE2838F86EFE80208"]; + let uxt: UncheckedExtrinsic = Slicable::decode(&mut &data[..]).unwrap(); + assert_eq!(uxt.extrinsic, xt); + + assert_eq!(Extrinsic::decode(&mut &v[..]).unwrap(), xt); + } } diff --git a/polkadot/runtime/wasm/genesis.wasm b/polkadot/runtime/wasm/genesis.wasm index bc0861d31f..05ff2f4505 100644 Binary files a/polkadot/runtime/wasm/genesis.wasm and b/polkadot/runtime/wasm/genesis.wasm differ 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 e81d2066e6..05ff2f4505 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 7e31a2dea6..4bb8fff698 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 d4cacf37b9..177675ea70 100644 --- a/polkadot/service/src/config.rs +++ b/polkadot/service/src/config.rs @@ -23,8 +23,10 @@ pub use network::NetworkConfiguration; /// The chain specification (this should eventually be replaced by a more general JSON-based chain /// specification). pub enum ChainSpec { - /// Whatever the current runtime is, with simple Alice/Bob auths. + /// Whatever the current runtime is, with just Alice as an auth. Development, + /// Whatever the current runtime is, with simple Alice/Bob auths. + LocalTestnet, /// The PoC-1 testnet. PoC1Testnet, } diff --git a/polkadot/service/src/lib.rs b/polkadot/service/src/lib.rs index 7d770b67d3..36651dcac1 100644 --- a/polkadot/service/src/lib.rs +++ b/polkadot/service/src/lib.rs @@ -56,7 +56,7 @@ use parking_lot::Mutex; use tokio_core::reactor::Core; use codec::Slicable; use primitives::block::{Id as BlockId, Extrinsic, ExtrinsicHash, HeaderHash}; -use primitives::hashing; +use primitives::{AuthorityId, hashing}; use transaction_pool::TransactionPool; use substrate_executor::NativeExecutor; use polkadot_executor::Executor as LocalDispatch; @@ -98,8 +98,9 @@ impl network::TransactionPool for TransactionPoolAdapter { } }; let id = self.client.check_id(BlockId::Hash(best_block)).expect("Best block is always valid; qed."); - let ready = transaction_pool::Ready::create(id, &*self.client); - self.pool.lock().pending(ready).map(|t| { + let mut pool = self.pool.lock(); + pool.cull(None, transaction_pool::Ready::create(id, &*self.client)); + pool.pending(transaction_pool::Ready::create(id, &*self.client)).map(|t| { let hash = ::primitives::Hash::from(&t.hash()[..]); let tx = codec::Slicable::encode(t.as_transaction()); (hash, tx) @@ -135,9 +136,10 @@ fn poc_1_testnet_config() -> ChainConfig { hex!["82c39b31a2b79a90f8e66e7a77fdb85a4ed5517f2ae39f6a80565e8ecae85cf5"].into(), hex!["4de37a07567ebcbf8c64568428a835269a566723687058e017b6d69db00a77e7"].into(), hex!["063d7787ebca768b7445dfebe7d62cbb1625ff4dba288ea34488da266dd6dca5"].into(), + hex!["8101764f45778d4980dadaceee6e8af2517d3ab91ac9bec9cd1714fa5994081c"].into(), ]; let endowed_accounts = vec![ - hex!["24d132eb1a4cbf8e46de22652019f1e07fadd5037a6a057c75dbbfd4641ba85d"].into(), + hex!["f295940fa750df68a686fcf4abd4111c8a9c5a5a5a83c4c8639c451a94a7adfd"].into(), ]; let genesis_config = GenesisConfig { consensus: Some(ConsensusConfig { @@ -151,7 +153,7 @@ fn poc_1_testnet_config() -> ChainConfig { }), staking: Some(StakingConfig { current_era: 0, - intentions: vec![], + intentions: initial_authorities.clone(), transaction_fee: 100, balances: endowed_accounts.iter().map(|&k|(k, 1u64 << 60)).collect(), validator_count: 12, @@ -180,15 +182,15 @@ fn poc_1_testnet_config() -> ChainConfig { }), parachains: Some(Default::default()), }; - let boot_nodes = Vec::new(); + let boot_nodes = vec![ + "enode://ce29df27adace5c2a08efc2fd58ce1a2587f2157061e7788861dfef3c0cbf275af8476f93b5f10ecbcd7d6c2fdac109b581502dd7a67a361f9efa7593308bedd@104.211.54.233:30333".into(), + "enode://db86cdf0d653c774cb9f357ba99ee035b2dc3ae4313e93a79a38d9e0089dc5eacdf01a5cab7d41b6a44c83bc78599b76318bc59501f9d62cc6b08cfb74777032@104.211.48.51:30333".into(), + "enode://a9458a01ccc278eab98ee329f529ca3bcb88e13e4e0cda7318a63c6ae704b74eca7c5a05cff106d531cdc41facfbe63540de5f733108fbbbb7d0235131ca39a0@104.211.48.247:30333".into(), + ]; ChainConfig { genesis_config, boot_nodes } } -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(), - ]; +fn testnet_config(initial_authorities: Vec) -> ChainConfig { let endowed_accounts = vec![ ed25519::Pair::from_seed(b"Alice ").public().into(), ed25519::Pair::from_seed(b"Bob ").public().into(), @@ -222,15 +224,15 @@ fn local_testnet_config() -> ChainConfig { minimum_deposit: 10, }), council: Some(CouncilConfig { - active_council: vec![], + active_council: endowed_accounts.iter().filter(|a| initial_authorities.iter().find(|b| a == b).is_none()).map(|a| (a.clone(), 1000000)).collect(), 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, + term_duration: 1000000, + desired_seats: (endowed_accounts.len() - initial_authorities.len()) as u32, inactive_grace_period: 1, cooloff_period: 75, @@ -242,6 +244,19 @@ fn local_testnet_config() -> ChainConfig { ChainConfig { genesis_config, boot_nodes } } +fn development_config() -> ChainConfig { + testnet_config(vec![ + ed25519::Pair::from_seed(b"Alice ").public().into(), + ]) +} + +fn local_testnet_config() -> ChainConfig { + testnet_config(vec![ + ed25519::Pair::from_seed(b"Alice ").public().into(), + ed25519::Pair::from_seed(b"Bob ").public().into(), + ]) +} + impl Service { /// Creates and register protocol with the network service pub fn new(mut config: Configuration) -> Result { @@ -264,7 +279,8 @@ impl Service { } let ChainConfig { genesis_config, boot_nodes } = match config.chain_spec { - ChainSpec::Development => local_testnet_config(), + ChainSpec::Development => development_config(), + ChainSpec::LocalTestnet => local_testnet_config(), ChainSpec::PoC1Testnet => poc_1_testnet_config(), }; config.network.boot_nodes.extend(boot_nodes);