EIP-86

ethcore/light/src/client/mod.rs

@@ -106,6 +106,9 @@ pub trait LightChainClient: Send + Sync {
 
 	/// Get the `i`th CHT root.
 	fn cht_root(&self, i: usize) -> Option<H256>;
+
+	/// Get the EIP-86 transition block number.
+	fn eip86_transition(&self) -> u64;
 }
 
 /// Something which can be treated as a `LightChainClient`.
@@ -384,4 +387,8 @@ impl LightChainClient for Client {
 	fn cht_root(&self, i: usize) -> Option<H256> {
 		Client::cht_root(self, i)
 	}
+
+	fn eip86_transition(&self) -> u64 {
+		self.engine().params().eip86_transition
+	}
 }

ethcore/res/ethereum/classic.json

@@ -30,7 +30,8 @@
 		"chainID": "0x3d",
 		"forkBlock": "0x1d4c00",
 		"forkCanonHash": "0x94365e3a8c0b35089c1d1195081fe7489b528a84b22199c916180db8b28ade7f",
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {

ethcore/res/ethereum/eip150_test.json

@@ -24,7 +24,8 @@
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
 		"networkID" : "0x1",
-		"eip98Transition": "0x7fffffffffffffff"
+		"eip98Transition": "0x7fffffffffffffff",
+		"eip86Transition": "0x7fffffffffffffff"
 	},
 	"genesis": {
 		"seal": {

ethcore/res/ethereum/eip161_test.json

@@ -24,7 +24,8 @@
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
 		"networkID" : "0x1",
-		"eip98Transition": "0x7fffffffffffffff"
+		"eip98Transition": "0x7fffffffffffffff",
+		"eip86Transition": "0x7fffffffffffffff"
 	},
 	"genesis": {
 		"seal": {

ethcore/res/ethereum/expanse.json

@@ -30,7 +30,8 @@
 		"networkID": "0x1",
 		"chainID": "0x2",
 		"subprotocolName": "exp",
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {

ethcore/res/ethereum/foundation.json

@@ -147,7 +147,8 @@
 		"networkID" : "0x1",
 		"forkBlock": "0x1d4c00",
 		"forkCanonHash": "0x4985f5ca3d2afbec36529aa96f74de3cc10a2a4a6c44f2157a57d2c6059a11bb",
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {

ethcore/res/ethereum/frontier_like_test.json

@@ -143,7 +143,8 @@
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
 		"networkID" : "0x1",
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {

ethcore/res/ethereum/frontier_test.json

@@ -23,7 +23,8 @@
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
 		"networkID" : "0x1",
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {

ethcore/res/ethereum/homestead_test.json

@@ -23,7 +23,8 @@
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
 		"networkID" : "0x1",
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {

ethcore/res/ethereum/morden.json

@@ -30,7 +30,8 @@
 		"chainID": "0x3e",
 		"forkBlock": "0x1b34d8",
 		"forkCanonHash": "0xf376243aeff1f256d970714c3de9fd78fa4e63cf63e32a51fe1169e375d98145",
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {

ethcore/res/ethereum/olympic.json

@@ -23,7 +23,8 @@
 		"maximumExtraDataSize": "0x0400",
 		"minGasLimit": "125000",
 		"networkID" : "0x0",
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {

ethcore/res/ethereum/ropsten.json

@@ -27,7 +27,8 @@
 		"networkID" : "0x3",
 		"forkBlock": 641350,
 		"forkCanonHash": "0x8033403e9fe5811a7b6d6b469905915de1c59207ce2172cbcf5d6ff14fa6a2eb",
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {

ethcore/res/ethereum/transition_test.json

@@ -139,11 +139,12 @@
 		}
 	},
 	"params": {
-		"eip98Transition": "0x7fffffffffffffff",
 		"accountStartNonce": "0x00",
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
-		"networkID" : "0x1"
+		"networkID" : "0x1",
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {

ethcore/res/null.json

@@ -7,7 +7,8 @@
 		"accountStartNonce": "0x0",
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
-		"networkID" : "0x2"
+		"networkID" : "0x2",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {

ethcore/src/client/client.rs

@@ -960,7 +960,7 @@ impl BlockChainClient for Client {
 				return Err(err.into())
 			}
 		}
-		let lower = t.gas_required(&self.engine.schedule(&env_info)).into();
+		let lower = t.gas_required(&self.engine.schedule(env_info.number)).into();
 		if cond(lower)? {
 			trace!(target: "estimate_gas", "estimate_gas succeeded with {}", lower);
 			return Ok(lower)
@@ -1259,7 +1259,8 @@ impl BlockChainClient for Client {
 					.collect();
 				match (transaction, previous_receipts) {
 					(Some(transaction), Some(previous_receipts)) => {
-						Some(transaction_receipt(transaction, previous_receipts))
+						let schedule = self.engine().schedule(block_number);
+						Some(transaction_receipt(&schedule, transaction, previous_receipts))
 					},
 					_ => None,
 				}
@@ -1501,11 +1502,15 @@ impl BlockChainClient for Client {
 			})
 			.and_then(|a| if a.is_zero() { None } else { Some(a) })
 	}
+
+	fn eip86_transition(&self) -> u64 {
+		self.engine().params().eip86_transition
+	}
 }
 
 impl MiningBlockChainClient for Client {
 	fn latest_schedule(&self) -> Schedule {
-		self.engine.schedule(&self.latest_env_info())
+		self.engine.schedule(self.latest_env_info().number)
 	}
 
 	fn prepare_open_block(&self, author: Address, gas_range_target: (U256, U256), extra_data: Bytes) -> OpenBlock {
@@ -1655,7 +1660,7 @@ impl Drop for Client {
 
 /// Returns `LocalizedReceipt` given `LocalizedTransaction`
 /// and a vector of receipts from given block up to transaction index.
-fn transaction_receipt(mut tx: LocalizedTransaction, mut receipts: Vec<Receipt>) -> LocalizedReceipt {
+fn transaction_receipt(schedule: &Schedule, mut tx: LocalizedTransaction, mut receipts: Vec<Receipt>) -> LocalizedReceipt {
 	assert_eq!(receipts.len(), tx.transaction_index + 1, "All previous receipts are provided.");
 
 	let sender = tx.sender();
@@ -1674,12 +1679,12 @@ fn transaction_receipt(mut tx: LocalizedTransaction, mut receipts: Vec<Receipt>)
 		transaction_hash: transaction_hash,
 		transaction_index: transaction_index,
 		block_hash: block_hash,
-		block_number:block_number,
+		block_number: block_number,
 		cumulative_gas_used: receipt.gas_used,
 		gas_used: receipt.gas_used - prior_gas_used,
 		contract_address: match tx.action {
 			Action::Call(_) => None,
-			Action::Create => Some(contract_address(&sender, &tx.nonce))
+			Action::Create => Some(contract_address(schedule.create_address, &sender, &tx.nonce, &tx.data.sha3()))
 		},
 		logs: receipt.logs.into_iter().enumerate().map(|(i, log)| LocalizedLogEntry {
 			entry: log,
@@ -1734,6 +1739,7 @@ mod tests {
 	#[test]
 	fn should_return_correct_log_index() {
 		use super::transaction_receipt;
+		use evm::schedule::Schedule;
 		use ethkey::KeyPair;
 		use log_entry::{LogEntry, LocalizedLogEntry};
 		use receipt::{Receipt, LocalizedReceipt};
@@ -1743,6 +1749,7 @@ mod tests {
 		// given
 		let key = KeyPair::from_secret_slice(&"test".sha3()).unwrap();
 		let secret = key.secret();
+		let schedule = Schedule::new_homestead();
 
 		let block_number = 1;
 		let block_hash = 5.into();
@@ -1786,7 +1793,7 @@ mod tests {
 		}];
 
 		// when
-		let receipt = transaction_receipt(transaction, receipts);
+		let receipt = transaction_receipt(&schedule, transaction, receipts);
 
 		// then
 		assert_eq!(receipt, LocalizedReceipt {

ethcore/src/client/test_client.rs

@@ -353,7 +353,7 @@ pub fn get_temp_state_db() -> GuardedTempResult<StateDB> {
 
 impl MiningBlockChainClient for TestBlockChainClient {
 	fn latest_schedule(&self) -> Schedule {
-		Schedule::new_post_eip150(24576, true, true, true)
+		Schedule::new_post_eip150(24576, true, true, true, true)
 	}
 
 	fn prepare_open_block(&self, author: Address, gas_range_target: (U256, U256), extra_data: Bytes) -> OpenBlock {
@@ -756,6 +756,8 @@ impl BlockChainClient for TestBlockChainClient {
 	fn registrar_address(&self) -> Option<Address> { None }
 
 	fn registry_address(&self, _name: String) -> Option<Address> { None }
+
+	fn eip86_transition(&self) -> u64 { u64::max_value() }
 }
 
 impl ProvingBlockChainClient for TestBlockChainClient {

ethcore/src/client/traits.rs

@@ -272,6 +272,9 @@ pub trait BlockChainClient : Sync + Send {
 
 	/// Get the address of a particular blockchain service, if available.
 	fn registry_address(&self, name: String) -> Option<Address>;
+
+	/// Get the EIP-86 transition block number.
+	fn eip86_transition(&self) -> u64;
 }
 
 impl IpcConfig for BlockChainClient { }

ethcore/src/engines/authority_round.rs

@@ -26,12 +26,11 @@ use account_provider::AccountProvider;
 use block::*;
 use spec::CommonParams;
 use engines::{Engine, Seal, EngineError};
-use header::Header;
+use header::{Header, BlockNumber};
 use error::{Error, TransactionError, BlockError};
 use evm::Schedule;
 use ethjson;
 use io::{IoContext, IoHandler, TimerToken, IoService};
-use env_info::EnvInfo;
 use builtin::Builtin;
 use transaction::UnverifiedTransaction;
 use client::{Client, EngineClient};
@@ -241,8 +240,9 @@ impl Engine for AuthorityRound {
 		]
 	}
 
-	fn schedule(&self, _env_info: &EnvInfo) -> Schedule {
-		Schedule::new_post_eip150(usize::max_value(), true, true, true)
+	fn schedule(&self, block_number: BlockNumber) -> Schedule {
+		let eip86 = block_number >= self.params.eip86_transition;
+		Schedule::new_post_eip150(usize::max_value(), true, true, true, eip86)
 	}
 
 	fn populate_from_parent(&self, header: &mut Header, parent: &Header, gas_floor_target: U256, _gas_ceil_target: U256) {
@@ -387,7 +387,6 @@ impl Engine for AuthorityRound {
 #[cfg(test)]
 mod tests {
 	use util::*;
-	use env_info::EnvInfo;
 	use header::Header;
 	use error::{Error, BlockError};
 	use ethkey::Secret;
@@ -408,15 +407,7 @@ mod tests {
 	#[test]
 	fn can_return_schedule() {
 		let engine = Spec::new_test_round().engine;
-		let schedule = engine.schedule(&EnvInfo {
-			number: 10000000,
-			author: 0.into(),
-			timestamp: 0,
-			difficulty: 0.into(),
-			last_hashes: Arc::new(vec![]),
-			gas_used: 0.into(),
-			gas_limit: 0.into(),
-		});
+		let schedule = engine.schedule(10000000);
 
 		assert!(schedule.stack_limit > 0);
 	}

ethcore/src/engines/basic_authority.rs

@@ -24,11 +24,10 @@ use block::*;
 use builtin::Builtin;
 use spec::CommonParams;
 use engines::{Engine, Seal};
-use env_info::EnvInfo;
 use error::{BlockError, Error};
 use evm::Schedule;
 use ethjson;
-use header::Header;
+use header::{Header, BlockNumber};
 use client::Client;
 use super::signer::EngineSigner;
 use super::validator_set::{ValidatorSet, new_validator_set};
@@ -86,7 +85,7 @@ impl Engine for BasicAuthority {
 	/// Additional engine-specific information for the user/developer concerning `header`.
 	fn extra_info(&self, _header: &Header) -> BTreeMap<String, String> { map!["signature".to_owned() => "TODO".to_owned()] }
 
-	fn schedule(&self, _env_info: &EnvInfo) -> Schedule {
+	fn schedule(&self, _block_number: BlockNumber) -> Schedule {
 		Schedule::new_homestead()
 	}
 
@@ -181,7 +180,6 @@ impl Engine for BasicAuthority {
 mod tests {
 	use util::*;
 	use block::*;
-	use env_info::EnvInfo;
 	use error::{BlockError, Error};
 	use tests::helpers::*;
 	use account_provider::AccountProvider;
@@ -206,16 +204,7 @@ mod tests {
 	#[test]
 	fn can_return_schedule() {
 		let engine = new_test_authority().engine;
-		let schedule = engine.schedule(&EnvInfo {
-			number: 10000000,
-			author: 0.into(),
-			timestamp: 0,
-			difficulty: 0.into(),
-			last_hashes: Arc::new(vec![]),
-			gas_used: 0.into(),
-			gas_limit: 0.into(),
-		});
-
+		let schedule = engine.schedule(10000000);
 		assert!(schedule.stack_limit > 0);
 	}
 

ethcore/src/engines/instant_seal.rs

@@ -18,10 +18,10 @@ use std::collections::BTreeMap;
 use util::{Address, HashMap};
 use builtin::Builtin;
 use engines::{Engine, Seal};
-use env_info::EnvInfo;
 use spec::CommonParams;
 use evm::Schedule;
 use block::ExecutedBlock;
+use header::BlockNumber;
 
 /// An engine which does not provide any consensus mechanism, just seals blocks internally.
 pub struct InstantSeal {
@@ -58,8 +58,9 @@ impl Engine for InstantSeal {
 		&self.builtins
 	}
 
-	fn schedule(&self, _env_info: &EnvInfo) -> Schedule {
-		Schedule::new_post_eip150(usize::max_value(), true, true, true)
+	fn schedule(&self, block_number: BlockNumber) -> Schedule {
+		let eip86 = block_number >= self.params.eip86_transition;
+		Schedule::new_post_eip150(usize::max_value(), true, true, true, eip86)
 	}
 
 	fn seals_internally(&self) -> Option<bool> { Some(true) }