Merge branch 'master' into pv63-receipts

Conflicts:
	ethcore/src/client/client.rs

Cargo.lock

@@ -1,18 +1,18 @@
 [root]
 name = "parity"
-version = "0.9.99"
+version = "1.1.0"
 dependencies = [
  "clippy 0.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
  "ctrlc 1.1.1 (git+https://github.com/tomusdrw/rust-ctrlc.git)",
  "daemonize 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "docopt 0.6.78 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore 0.9.99",
+ "ethcore 1.1.0",
- "ethcore-devtools 0.9.99",
+ "ethcore-devtools 1.1.0",
- "ethcore-rpc 0.9.99",
+ "ethcore-rpc 1.1.0",
- "ethcore-util 0.9.99",
+ "ethcore-util 1.1.0",
- "ethminer 0.9.99",
+ "ethminer 1.1.0",
- "ethsync 0.9.99",
+ "ethsync 1.1.0",
  "fdlimit 0.1.0",
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "number_prefix 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -162,7 +162,7 @@ name = "docopt"
 version = "0.6.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "regex 0.1.55 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "strsim 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -178,7 +178,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.1.55 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -197,7 +197,7 @@ dependencies = [
 
 [[package]]
 name = "ethash"
-version = "0.9.99"
+version = "1.1.0"
 dependencies = [
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "primal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -206,14 +206,14 @@ dependencies = [
 
 [[package]]
 name = "ethcore"
-version = "0.9.99"
+version = "1.1.0"
 dependencies = [
  "clippy 0.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethash 0.9.99",
+ "ethash 1.1.0",
- "ethcore-devtools 0.9.99",
+ "ethcore-devtools 1.1.0",
- "ethcore-util 0.9.99",
+ "ethcore-util 1.1.0",
  "heapsize 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -225,21 +225,21 @@ dependencies = [
 
 [[package]]
 name = "ethcore-devtools"
-version = "0.9.99"
+version = "1.1.0"
 dependencies = [
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ethcore-rpc"
-version = "0.9.99"
+version = "1.1.0"
 dependencies = [
  "clippy 0.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethash 0.9.99",
+ "ethash 1.1.0",
- "ethcore 0.9.99",
+ "ethcore 1.1.0",
- "ethcore-util 0.9.99",
+ "ethcore-util 1.1.0",
- "ethminer 0.9.99",
+ "ethminer 1.1.0",
- "ethsync 0.9.99",
+ "ethsync 1.1.0",
  "jsonrpc-core 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-http-server 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -253,7 +253,7 @@ dependencies = [
 
 [[package]]
 name = "ethcore-util"
-version = "0.9.99"
+version = "1.1.0"
 dependencies = [
  "arrayvec 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "bigint 0.1.0",
@@ -263,7 +263,7 @@ dependencies = [
  "elastic-array 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "eth-secp256k1 0.5.4 (git+https://github.com/ethcore/rust-secp256k1)",
- "ethcore-devtools 0.9.99",
+ "ethcore-devtools 1.1.0",
  "heapsize 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "igd 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -288,12 +288,12 @@ dependencies = [
 
 [[package]]
 name = "ethminer"
-version = "0.9.99"
+version = "1.1.0"
 dependencies = [
  "clippy 0.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore 0.9.99",
+ "ethcore 1.1.0",
- "ethcore-util 0.9.99",
+ "ethcore-util 1.1.0",
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -302,13 +302,13 @@ dependencies = [
 
 [[package]]
 name = "ethsync"
-version = "0.9.99"
+version = "1.1.0"
 dependencies = [
  "clippy 0.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore 0.9.99",
+ "ethcore 1.1.0",
- "ethcore-util 0.9.99",
+ "ethcore-util 1.1.0",
- "ethminer 0.9.99",
+ "ethminer 1.1.0",
  "heapsize 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -343,7 +343,7 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.1.55 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -406,7 +406,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "hyper 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.1.55 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
  "xml-rs 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "xmltree 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -687,12 +687,12 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "0.1.55"
+version = "0.1.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "aho-corasick 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "memchr 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -701,6 +701,11 @@ name = "regex-syntax"
 version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "regex-syntax"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "rocksdb"
 version = "0.4.3"

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 description = "Ethcore client."
 name = "parity"
-version = "0.9.99"
+version = "1.1.0"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"

devtools/Cargo.toml

@@ -3,7 +3,7 @@ description = "Ethcore development/test/build tools"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore-devtools"
-version = "0.9.99"
+version = "1.1.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 
 [dependencies]

ethash/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ethash"
-version = "0.9.99"
+version = "1.1.0"
 authors = ["arkpar <arkadiy@ethcore.io"]
 
 [lib]

ethcore/Cargo.toml

@@ -3,7 +3,7 @@ description = "Ethcore library"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore"
-version = "0.9.99"
+version = "1.1.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 
 [dependencies]

ethcore/src/block.rs

@@ -171,7 +171,7 @@ pub struct SealedBlock {
 
 impl<'x> OpenBlock<'x> {
 	/// Create a new OpenBlock ready for transaction pushing.
-	pub fn new(engine: &'x Engine, db: Box<JournalDB>, parent: &Header, last_hashes: LastHashes, author: Address, extra_data: Bytes) -> Self {
+	pub fn new(engine: &'x Engine, db: Box<JournalDB>, parent: &Header, last_hashes: LastHashes, author: Address, gas_floor_target: U256, extra_data: Bytes) -> Self {
 		let mut r = OpenBlock {
 			block: ExecutedBlock::new(State::from_existing(db, parent.state_root().clone(), engine.account_start_nonce())),
 			engine: engine,
@@ -185,7 +185,7 @@ impl<'x> OpenBlock<'x> {
 		r.block.base.header.extra_data = extra_data;
 		r.block.base.header.note_dirty();
 
-		engine.populate_from_parent(&mut r.block.base.header, parent);
+		engine.populate_from_parent(&mut r.block.base.header, parent, gas_floor_target);
 		engine.on_new_block(&mut r.block);
 		r
 	}
@@ -347,7 +347,7 @@ pub fn enact(header: &Header, transactions: &[SignedTransaction], uncles: &[Head
 		}
 	}
 
-	let mut b = OpenBlock::new(engine, db, parent, last_hashes, header.author().clone(), header.extra_data().clone());
+	let mut b = OpenBlock::new(engine, db, parent, last_hashes, header.author().clone(), x!(3141562), header.extra_data().clone());
 	b.set_difficulty(*header.difficulty());
 	b.set_gas_limit(*header.gas_limit());
 	b.set_timestamp(header.timestamp());
@@ -391,7 +391,7 @@ mod tests {
 		let mut db = db_result.take();
 		engine.spec().ensure_db_good(db.as_hashdb_mut());
 		let last_hashes = vec![genesis_header.hash()];
-		let b = OpenBlock::new(engine.deref(), db, &genesis_header, last_hashes, Address::zero(), vec![]);
+		let b = OpenBlock::new(engine.deref(), db, &genesis_header, last_hashes, Address::zero(), x!(3141562), vec![]);
 		let b = b.close();
 		let _ = b.seal(engine.deref(), vec![]);
 	}
@@ -405,7 +405,7 @@ mod tests {
 		let mut db_result = get_temp_journal_db();
 		let mut db = db_result.take();
 		engine.spec().ensure_db_good(db.as_hashdb_mut());
-		let b = OpenBlock::new(engine.deref(), db, &genesis_header, vec![genesis_header.hash()], Address::zero(), vec![]).close().seal(engine.deref(), vec![]).unwrap();
+		let b = OpenBlock::new(engine.deref(), db, &genesis_header, vec![genesis_header.hash()], Address::zero(), x!(3141562), vec![]).close().seal(engine.deref(), vec![]).unwrap();
 		let orig_bytes = b.rlp_bytes();
 		let orig_db = b.drain();
 

ethcore/src/client/client.rs

@@ -109,6 +109,11 @@ pub struct Client<V = CanonVerifier> where V: Verifier {
 }
 
 const HISTORY: u64 = 1200;
+// DO NOT TOUCH THIS ANY MORE UNLESS YOU REALLY KNOW WHAT YOU'RE DOING.
+// Altering it will force a blanket DB update for *all* JournalDB-derived
+//   databases.
+// Instead, add/upgrade the version string of the individual JournalDB-derived database
+// of which you actually want force an upgrade.
 const CLIENT_DB_VER_STR: &'static str = "5.3";
 
 impl Client<CanonVerifier> {
@@ -380,15 +385,13 @@ impl<V> Client<V> where V: Verifier {
 }
 
 impl<V> BlockChainClient for Client<V> where V: Verifier {
-
-
 	// TODO [todr] Should be moved to miner crate eventually.
 	fn try_seal(&self, block: ClosedBlock, seal: Vec<Bytes>) -> Result<SealedBlock, ClosedBlock> {
 		block.try_seal(self.engine.deref().deref(), seal)
 	}
 
 	// TODO [todr] Should be moved to miner crate eventually.
-	fn prepare_sealing(&self, author: Address, extra_data: Bytes, transactions: Vec<SignedTransaction>) -> Option<ClosedBlock> {
+	fn prepare_sealing(&self, author: Address, gas_floor_target: U256, extra_data: Bytes, transactions: Vec<SignedTransaction>) -> Option<ClosedBlock> {
 		let engine = self.engine.deref().deref();
 		let h = self.chain.best_block_hash();
 
@@ -398,6 +401,7 @@ impl<V> BlockChainClient for Client<V> where V: Verifier {
 			match self.chain.block_header(&h) { Some(ref x) => x, None => {return None} },
 			self.build_last_hashes(h.clone()),
 			author,
+			gas_floor_target,
 			extra_data,
 		);
 

ethcore/src/client/mod.rs

@@ -110,7 +110,7 @@ pub trait BlockChainClient : Sync + Send {
 
 	// TODO [todr] Should be moved to miner crate eventually.
 	/// Returns ClosedBlock prepared for sealing.
-	fn prepare_sealing(&self, author: Address, extra_data: Bytes, transactions: Vec<SignedTransaction>) -> Option<ClosedBlock>;
+	fn prepare_sealing(&self, author: Address, gas_floor_target: U256, extra_data: Bytes, transactions: Vec<SignedTransaction>) -> Option<ClosedBlock>;
 
 	// TODO [todr] Should be moved to miner crate eventually.
 	/// Attempts to seal given block. Returns `SealedBlock` on success and the same block in case of error.

ethcore/src/client/test_client.rs

@@ -217,7 +217,7 @@ impl BlockChainClient for TestBlockChainClient {
 		unimplemented!();
 	}
 
-	fn prepare_sealing(&self, _author: Address, _extra_data: Bytes, _transactions: Vec<SignedTransaction>) -> Option<ClosedBlock> {
+	fn prepare_sealing(&self, _author: Address, _gas_floor_target: U256, _extra_data: Bytes, _transactions: Vec<SignedTransaction>) -> Option<ClosedBlock> {
 		unimplemented!()
 	}
 

ethcore/src/engine.rs

@@ -85,7 +85,7 @@ pub trait Engine : Sync + Send {
 
 	/// Don't forget to call Super::populate_from_parent when subclassing & overriding.
 	// TODO: consider including State in the params.
-	fn populate_from_parent(&self, header: &mut Header, parent: &Header) {
+	fn populate_from_parent(&self, header: &mut Header, parent: &Header, _gas_floor_target: U256) {
 		header.difficulty = parent.difficulty;
 		header.gas_limit = parent.gas_limit;
 		header.note_dirty();

ethcore/src/ethereum/ethash.rs

@@ -92,10 +92,9 @@ impl Engine for Ethash {
 		}
 	}
 
-	fn populate_from_parent(&self, header: &mut Header, parent: &Header) {
+	fn populate_from_parent(&self, header: &mut Header, parent: &Header, gas_floor_target: U256) {
 		header.difficulty = self.calculate_difficuty(header, parent);
 		header.gas_limit = {
-			let gas_floor_target: U256 = x!(3141562);
 			let gas_limit = parent.gas_limit;
 			let bound_divisor = self.u256_param("gasLimitBoundDivisor");
 			if gas_limit < gas_floor_target {
@@ -300,7 +299,7 @@ mod tests {
 		let mut db = db_result.take();
 		engine.spec().ensure_db_good(db.as_hashdb_mut());
 		let last_hashes = vec![genesis_header.hash()];
-		let b = OpenBlock::new(engine.deref(), db, &genesis_header, last_hashes, Address::zero(), vec![]);
+		let b = OpenBlock::new(engine.deref(), db, &genesis_header, last_hashes, Address::zero(), x!(3141562), vec![]);
 		let b = b.close();
 		assert_eq!(b.state().balance(&Address::zero()), U256::from_str("4563918244f40000").unwrap());
 	}
@@ -313,7 +312,7 @@ mod tests {
 		let mut db = db_result.take();
 		engine.spec().ensure_db_good(db.as_hashdb_mut());
 		let last_hashes = vec![genesis_header.hash()];
-		let mut b = OpenBlock::new(engine.deref(), db, &genesis_header, last_hashes, Address::zero(), vec![]);
+		let mut b = OpenBlock::new(engine.deref(), db, &genesis_header, last_hashes, Address::zero(), x!(3141562), vec![]);
 		let mut uncle = Header::new();
 		let uncle_author = address_from_hex("ef2d6d194084c2de36e0dabfce45d046b37d1106");
 		uncle.author = uncle_author.clone();

ethcore/src/evm/tests.rs

@@ -55,7 +55,7 @@ struct FakeExt {
 	info: EnvInfo,
 	schedule: Schedule,
 	balances: HashMap<Address, U256>,
-	calls: HashSet<FakeCall>
+	calls: HashSet<FakeCall>,
 }
 
 impl FakeExt {
@@ -346,7 +346,7 @@ fn test_log_empty(factory: super::Factory) {
 	assert_eq!(gas_left, U256::from(99_619));
 	assert_eq!(ext.logs.len(), 1);
 	assert_eq!(ext.logs[0].topics.len(), 0);
-	assert_eq!(ext.logs[0].data, vec![]);
+	assert!(ext.logs[0].data.is_empty());
 }
 
 evm_test!{test_log_sender: test_log_sender_jit, test_log_sender_int}

ethcore/src/tests/client.rs

@@ -144,7 +144,7 @@ fn can_mine() {
 	let client_result = get_test_client_with_blocks(vec![dummy_blocks[0].clone()]);
 	let client = client_result.reference();
 
-	let b = client.prepare_sealing(Address::default(), vec![], vec![]).unwrap();
+	let b = client.prepare_sealing(Address::default(), x!(31415926), vec![], vec![]).unwrap();
 
 	assert_eq!(*b.block().header().parent_hash(), BlockView::new(&dummy_blocks[0]).header_view().sha3());
 	assert!(client.try_seal(b, vec![]).is_ok());

evmjit/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "evmjit"
-version = "0.9.99"
+version = "1.1.0"
 authors = ["debris <marek.kotewicz@gmail.com>"]
 
 [lib]

miner/Cargo.toml

@@ -3,7 +3,7 @@ description = "Ethminer library"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethminer"
-version = "0.9.99"
+version = "1.1.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"
 

miner/src/miner.rs

@@ -19,7 +19,7 @@ use std::sync::{Mutex, RwLock, Arc};
 use std::sync::atomic;
 use std::sync::atomic::AtomicBool;
 
-use util::{H256, U256, Address, Bytes};
+use util::{H256, U256, Address, Bytes, Uint};
 use ethcore::views::{BlockView};
 use ethcore::client::{BlockChainClient, BlockId};
 use ethcore::block::{ClosedBlock};
@@ -34,8 +34,10 @@ pub struct Miner {
 	// for sealing...
 	sealing_enabled: AtomicBool,
 	sealing_block: Mutex<Option<ClosedBlock>>,
+	gas_floor_target: RwLock<U256>,
 	author: RwLock<Address>,
 	extra_data: RwLock<Bytes>,
+
 }
 
 impl Default for Miner {
@@ -44,6 +46,7 @@ impl Default for Miner {
 			transaction_queue: Mutex::new(TransactionQueue::new()),
 			sealing_enabled: AtomicBool::new(false),
 			sealing_block: Mutex::new(None),
+			gas_floor_target: RwLock::new(U256::zero()),
 			author: RwLock::new(Address::default()),
 			extra_data: RwLock::new(Vec::new()),
 		}
@@ -66,6 +69,11 @@ impl Miner {
 		self.extra_data.read().unwrap().clone()
 	}
 
+	/// Get the extra_data that we will seal blocks wuth.
+	fn gas_floor_target(&self) -> U256 {
+		self.gas_floor_target.read().unwrap().clone()
+	}
+
 	/// Set the author that we will seal blocks as.
 	pub fn set_author(&self, author: Address) {
 		*self.author.write().unwrap() = author;
@@ -76,6 +84,11 @@ impl Miner {
 		*self.extra_data.write().unwrap() = extra_data;
 	}
 
+	/// Set the gas limit we wish to target when sealing a new block.
+	pub fn set_gas_floor_target(&self, target: U256) {
+		*self.gas_floor_target.write().unwrap() = target;
+	}
+
 	/// Set minimal gas price of transaction to be accepted for mining.
 	pub fn set_minimal_gas_price(&self, min_gas_price: U256) {
 		self.transaction_queue.lock().unwrap().set_minimal_gas_price(min_gas_price);
@@ -110,10 +123,12 @@ impl MinerService for Miner {
 
 	fn prepare_sealing(&self, chain: &BlockChainClient) {
 		let no_of_transactions = 128;
+		// TODO: should select transactions orm queue according to gas limit of block.
 		let transactions = self.transaction_queue.lock().unwrap().top_transactions(no_of_transactions);
 
 		let b = chain.prepare_sealing(
 			self.author(),
+			self.gas_floor_target(),
 			self.extra_data(),
 			transactions,
 		);

parity/main.rs

@@ -119,6 +119,8 @@ API and Console Options:
 Sealing/Mining Options:
   --gas-price WEI          Minimum amount of Wei to be paid for a transaction
                            to be accepted for mining [default: 20000000000].
+  --gas-floor-target GAS   Amount of gas per block to target when sealing a new
+                           block [default: 4712388].
   --author ADDRESS         Specify the block author (aka "coinbase") address
                            for sending block rewards from sealed blocks
                            [default: 0037a6b811ffeb6e072da21179d11b1406371c63].
@@ -192,6 +194,7 @@ struct Args {
 	flag_jsonrpc_apis: String,
 	flag_author: String,
 	flag_gas_price: String,
+	flag_gas_floor_target: String,
 	flag_extra_data: Option<String>,
 	flag_logging: Option<String>,
 	flag_version: bool,
@@ -317,6 +320,13 @@ impl Configuration {
 		})
 	}
 
+	fn gas_floor_target(&self) -> U256 {
+		let d = &self.args.flag_gas_floor_target;
+		U256::from_dec_str(d).unwrap_or_else(|_| {
+			die!("{}: Invalid target gas floor given. Must be a decimal unsigned 256-bit number.", d)
+		})
+	}
+
 	fn gas_price(&self) -> U256 {
 		let d = self.args.flag_gasprice.as_ref().unwrap_or(&self.args.flag_gas_price);
 		U256::from_dec_str(d).unwrap_or_else(|_| {
@@ -499,6 +509,7 @@ impl Configuration {
 		// Miner
 		let miner = Miner::new();
 		miner.set_author(self.author());
+		miner.set_gas_floor_target(self.gas_floor_target());
 		miner.set_extra_data(self.extra_data());
 		miner.set_minimal_gas_price(self.gas_price());
 
@@ -597,13 +608,15 @@ impl Informant {
 		let chain_info = client.chain_info();
 		let queue_info = client.queue_info();
 		let cache_info = client.blockchain_cache_info();
-		let report = client.report();
 		let sync_info = sync.status();
 
+		let mut write_report = self.report.write().unwrap();
+		let report = client.report();
+
 		if let (_, _, &Some(ref last_report)) = (
 			self.chain_info.read().unwrap().deref(),
 			self.cache_info.read().unwrap().deref(),
-			self.report.read().unwrap().deref()
+			write_report.deref()
 		) {
 			println!("[ #{} {} ]---[ {} blk/s | {} tx/s | {} gas/s  //··· {}/{} peers, #{}, {}+{} queued ···// mem: {} db, {} chain, {} queue, {} sync ]",
 				chain_info.best_block_number,
@@ -627,7 +640,7 @@ impl Informant {
 
 		*self.chain_info.write().unwrap().deref_mut() = Some(chain_info);
 		*self.cache_info.write().unwrap().deref_mut() = Some(cache_info);
-		*self.report.write().unwrap().deref_mut() = Some(report);
+		*write_report.deref_mut() = Some(report);
 	}
 }
 

rpc/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 description = "Ethcore jsonrpc"
 name = "ethcore-rpc"
-version = "0.9.99"
+version = "1.1.0"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io"]
 build = "build.rs"

sync/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 description = "Ethcore blockchain sync"
 name = "ethsync"
-version = "0.9.99"
+version = "1.1.0"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io"]
 

util/Cargo.toml

@@ -3,7 +3,7 @@ description = "Ethcore utility library"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore-util"
-version = "0.9.99"
+version = "1.1.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"
 

util/bigint/src/uint.rs

@@ -1948,8 +1948,6 @@ mod tests {
 
 	#[test]
 	fn u256_multi_muls() {
-		use hash::*;
-
 		let (result, _) = U256([0, 0, 0, 0]).overflowing_mul(U256([0, 0, 0, 0]));
 		assert_eq!(U256([0, 0, 0, 0]), result);
 
@@ -1979,23 +1977,6 @@ mod tests {
 
 		let (result, _) = U256([1, 0, 0, 0]).overflowing_mul(U256([0, 0, 0, ::std::u64::MAX]));
 		assert_eq!(U256([0, 0, 0, ::std::u64::MAX]), result);
-
-		let x1 = U256::from_str("0000000000000000000000000000000000000000000000000000012365124623").unwrap();
-		let x2sqr_right = U256::from_str("000000000000000000000000000000000000000000014baeef72e0378e2328c9").unwrap();
-		let x1sqr = x1 * x1;
-		assert_eq!(H256::from(x2sqr_right), H256::from(x1sqr));
-		let x1cube = x1sqr * x1;
-		let x1cube_right = U256::from_str("0000000000000000000000000000000001798acde139361466f712813717897b").unwrap();
-		assert_eq!(H256::from(x1cube_right), H256::from(x1cube));
-		let x1quad = x1cube * x1;
-		let x1quad_right = U256::from_str("000000000000000000000001adbdd6bd6ff027485484b97f8a6a4c7129756dd1").unwrap();
-		assert_eq!(H256::from(x1quad_right), H256::from(x1quad));
-		let x1penta = x1quad * x1;
-		let x1penta_right = U256::from_str("00000000000001e92875ac24be246e1c57e0507e8c46cc8d233b77f6f4c72993").unwrap();
-		assert_eq!(H256::from(x1penta_right), H256::from(x1penta));
-		let x1septima = x1penta * x1;
-		let x1septima_right = U256::from_str("00022cca1da3f6e5722b7d3cc5bbfb486465ebc5a708dd293042f932d7eee119").unwrap();
-		assert_eq!(H256::from(x1septima_right), H256::from(x1septima));
 	}
 
     #[test]

util/src/bytes.rs

@@ -177,7 +177,7 @@ impl<T> BytesConvertable for T where T: AsRef<[u8]> {
 #[test]
 fn bytes_convertable() {
 	assert_eq!(vec![0x12u8, 0x34].bytes(), &[0x12u8, 0x34]);
-	assert_eq!([0u8; 0].bytes(), &[]);
+	assert!([0u8; 0].as_slice().is_empty());
 }
 
 /// Simple trait to allow for raw population of a Sized object from a byte slice.

util/src/misc.rs

@@ -70,7 +70,7 @@ pub fn contents(name: &str) -> Result<Bytes, UtilError> {
 
 /// Get the standard version string for this software.
 pub fn version() -> String {
-	format!("Parity/v{}-{}-{}/{}-{}-{}/rustc{}", env!("CARGO_PKG_VERSION"), short_sha(), commit_date().replace("-", ""), Target::arch(), Target::os(), Target::env(), rustc_version::version())
+	format!("Parity/v{}-unstable-{}-{}/{}-{}-{}/rustc{}", env!("CARGO_PKG_VERSION"), short_sha(), commit_date().replace("-", ""), Target::arch(), Target::os(), Target::env(), rustc_version::version())
 }
 
 /// Get the standard version data for this software.

util/src/network/discovery.rs

@@ -297,7 +297,7 @@ impl Discovery {
 					return;
 				}
 				Err(e) => {
-					warn!("UDP send error: {:?}, address: {:?}", e, &data.address);
+					debug!("UDP send error: {:?}, address: {:?}", e, &data.address);
 					return;
 				}
 			}
@@ -317,7 +317,7 @@ impl Discovery {
 			}),
 			Ok(_) => None,
 			Err(e) => {
-				warn!("Error reading UPD socket: {:?}", e);
+				debug!("Error reading UPD socket: {:?}", e);
 				None
 			}
 		}

util/src/network/host.rs

@@ -687,6 +687,8 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
 		if h.expired {
 			return;
 		}
+		io.deregister_stream(token).expect("Error deleting handshake registration");
+		h.set_expired();
 		let originated = h.originated;
 		let mut session = match Session::new(&mut h, &self.info.read().unwrap()) {
 			Ok(s) => s,
@@ -705,8 +707,6 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
 		}
 		let result = sessions.insert_with(move |session_token| {
 			session.set_token(session_token);
-			io.deregister_stream(token).expect("Error deleting handshake registration");
-			h.set_expired();
 			io.register_stream(session_token).expect("Error creating session registration");
 			self.stats.inc_sessions();
 			trace!(target: "network", "Creating session {} -> {}", token, session_token);