Generalize engine trait

ethcore/Cargo.toml

@@ -51,6 +51,7 @@ lru-cache = "0.1.0"
 native-contracts = { path = "native_contracts" }
 num = "0.1"
 num_cpus = "1.2"
+parity-machine = { path = "../machine" }
 parking_lot = "0.4"
 price-info = { path = "../price-info" }
 rayon = "0.8"

ethcore/light/src/client/fetch.rs

@@ -19,7 +19,8 @@
 use std::sync::Arc;
 
 use ethcore::encoded;
-use ethcore::engines::{Engine, StateDependentProof};
+use ethcore::engines::{EthEngine, StateDependentProof};
+use ethcore::machine::EthereumMachine;
 use ethcore::header::Header;
 use ethcore::receipt::Receipt;
 use futures::future::IntoFuture;
@@ -44,7 +45,12 @@ pub trait ChainDataFetcher: Send + Sync + 'static {
 	fn block_receipts(&self, header: &Header) -> Self::Receipts;
 
 	/// Fetch epoch transition proof at given header.
-	fn epoch_transition(&self, hash: H256, engine: Arc<Engine>, checker: Arc<StateDependentProof>) -> Self::Transition;
+	fn epoch_transition(
+		&self,
+		_hash: H256,
+		_engine: Arc<EthEngine>,
+		_checker: Arc<StateDependentProof<EthereumMachine>>
+	) -> Self::Transition;
 }
 
 /// Fetcher implementation which cannot fetch anything.
@@ -68,7 +74,12 @@ impl ChainDataFetcher for Unavailable {
 		Err("fetching block receipts unavailable")
 	}
 
-	fn epoch_transition(&self, _h: H256, _e: Arc<Engine>, _check: Arc<StateDependentProof>) -> Self::Transition {
+	fn epoch_transition(
+		&self,
+		_hash: H256,
+		_engine: Arc<EthEngine>,
+		_checker: Arc<StateDependentProof<EthereumMachine>>
+	) -> Self::Transition {
 		Err("fetching epoch transition proofs unavailable")
 	}
 }

ethcore/light/src/client/mod.rs

@@ -20,7 +20,8 @@ use std::sync::{Weak, Arc};
 
 use ethcore::block_status::BlockStatus;
 use ethcore::client::{ClientReport, EnvInfo};
-use ethcore::engines::{epoch, Engine, EpochChange, EpochTransition, Proof, Unsure};
+use ethcore::engines::{epoch, EthEngine, EpochChange, EpochTransition, Proof};
+use ethcore::machine::EthereumMachine;
 use ethcore::error::BlockImportError;
 use ethcore::ids::BlockId;
 use ethcore::header::{BlockNumber, Header};
@@ -117,7 +118,7 @@ pub trait LightChainClient: Send + Sync {
 	fn env_info(&self, id: BlockId) -> Option<EnvInfo>;
 
 	/// Get a handle to the consensus engine.
-	fn engine(&self) -> &Arc<Engine>;
+	fn engine(&self) -> &Arc<EthEngine>;
 
 	/// Query whether a block is known.
 	fn is_known(&self, hash: &H256) -> bool;
@@ -165,7 +166,7 @@ impl<T: LightChainClient> AsLightClient for T {
 /// Light client implementation.
 pub struct Client<T> {
 	queue: HeaderQueue,
-	engine: Arc<Engine>,
+	engine: Arc<EthEngine>,
 	chain: HeaderChain,
 	report: RwLock<ClientReport>,
 	import_lock: Mutex<()>,
@@ -381,7 +382,7 @@ impl<T: ChainDataFetcher> Client<T> {
 	}
 
 	/// Get a handle to the verification engine.
-	pub fn engine(&self) -> &Arc<Engine> {
+	pub fn engine(&self) -> &Arc<EthEngine> {
 		&self.engine
 	}
 
@@ -444,7 +445,7 @@ impl<T: ChainDataFetcher> Client<T> {
 		};
 
 		// Verify Block Family
-		let verify_family_result = self.engine.verify_block_family(&verified_header, &parent_header.decode(), None);
+		let verify_family_result = self.engine.verify_block_family(&verified_header, &parent_header.decode());
 		if let Err(e) = verify_family_result {
 			warn!(target: "client", "Stage 3 block verification failed for #{} ({})\nError: {:?}",
 				verified_header.number(), verified_header.hash(), e);
@@ -453,7 +454,7 @@ impl<T: ChainDataFetcher> Client<T> {
 		};
 
 		// "external" verification.
-		let verify_external_result = self.engine.verify_block_external(&verified_header, None);
+		let verify_external_result = self.engine.verify_block_external(&verified_header);
 		if let Err(e) = verify_external_result {
 			warn!(target: "client", "Stage 4 block verification failed for #{} ({})\nError: {:?}",
 				verified_header.number(), verified_header.hash(), e);
@@ -465,50 +466,54 @@ impl<T: ChainDataFetcher> Client<T> {
 		true
 	}
 
-	fn check_epoch_signal(&self, verified_header: &Header) -> Result<Option<Proof>, T::Error> {
-		let (mut block, mut receipts) = (None, None);
-
-		// First, check without providing auxiliary data.
-		match self.engine.signals_epoch_end(verified_header, None, None) {
-			EpochChange::No => return Ok(None),
-			EpochChange::Yes(proof) => return Ok(Some(proof)),
-			EpochChange::Unsure(unsure) => {
-				let (b, r) = match unsure {
-					Unsure::NeedsBody =>
-						(Some(self.fetcher.block_body(verified_header)), None),
-					Unsure::NeedsReceipts =>
-						(None, Some(self.fetcher.block_receipts(verified_header))),
-					Unsure::NeedsBoth => (
-						Some(self.fetcher.block_body(verified_header)),
-						Some(self.fetcher.block_receipts(verified_header)),
-					),
+	fn check_epoch_signal(&self, verified_header: &Header) -> Result<Option<Proof<EthereumMachine>>, T::Error> {
+		use ethcore::machine::{AuxiliaryRequest, AuxiliaryData};
+
+		let mut block: Option<Vec<u8>> = None;
+		let mut receipts: Option<Vec<_>> = None;
+
+		loop {
+
+
+			let is_signal = {
+				let auxiliary = AuxiliaryData {
+					bytes: block.as_ref().map(|x| &x[..]),
+					receipts: receipts.as_ref().map(|x| &x[..]),
 				};
 
-				if let Some(b) = b {
-					block = Some(b.into_future().wait()?.into_inner());
-				}
+				self.engine.signals_epoch_end(verified_header, auxiliary)
+			};
 
-				if let Some(r) = r {
-					receipts = Some(r.into_future().wait()?);
+			// check with any auxiliary data fetched so far
+			match is_signal {
+				EpochChange::No => return Ok(None),
+				EpochChange::Yes(proof) => return Ok(Some(proof)),
+				EpochChange::Unsure(unsure) => {
+					let (b, r) = match unsure {
+						AuxiliaryRequest::Body =>
+							(Some(self.fetcher.block_body(verified_header)), None),
+						AuxiliaryRequest::Receipts =>
+							(None, Some(self.fetcher.block_receipts(verified_header))),
+						AuxiliaryRequest::Both => (
+							Some(self.fetcher.block_body(verified_header)),
+							Some(self.fetcher.block_receipts(verified_header)),
+						),
+					};
+
+					if let Some(b) = b {
+						block = Some(b.into_future().wait()?.into_inner());
+					}
+
+					if let Some(r) = r {
+						receipts = Some(r.into_future().wait()?);
+					}
 				}
 			}
 		}
-
-		let block = block.as_ref().map(|x| &x[..]);
-		let receipts = receipts.as_ref().map(|x| &x[..]);
-
-		// Check again now that required data has been fetched.
-		match self.engine.signals_epoch_end(verified_header, block, receipts) {
-			EpochChange::No => return Ok(None),
-			EpochChange::Yes(proof) => return Ok(Some(proof)),
-			EpochChange::Unsure(_) =>
-				panic!("Detected faulty engine implementation: requests additional \
-					data to check epoch end signal when everything necessary provided"),
-		}
 	}
 
 	// attempts to fetch the epoch proof from the network until successful.
-	fn write_pending_proof(&self, header: &Header, proof: Proof) -> Result<(), T::Error> {
+	fn write_pending_proof(&self, header: &Header, proof: Proof<EthereumMachine>) -> Result<(), T::Error> {
 		let proof = match proof {
 			Proof::Known(known) => known,
 			Proof::WithState(state_dependent) => {
@@ -568,7 +573,7 @@ impl<T: ChainDataFetcher> LightChainClient for Client<T> {
 		Client::env_info(self, id)
 	}
 
-	fn engine(&self) -> &Arc<Engine> {
+	fn engine(&self) -> &Arc<EthEngine> {
 		Client::engine(self)
 	}
 

ethcore/light/src/on_demand/request.rs

@@ -20,8 +20,9 @@ use std::sync::Arc;
 
 use ethcore::basic_account::BasicAccount;
 use ethcore::encoded;
-use ethcore::engines::{Engine, StateDependentProof};
-use ethcore::receipt::{Receipt, TransactionOutcome};
+use ethcore::engines::{EthEngine, StateDependentProof};
+use ethcore::machine::EthereumMachine;
+use ethcore::receipt::Receipt;
 use ethcore::state::{self, ProvedExecution};
 use ethcore::transaction::SignedTransaction;
 use vm::EnvInfo;
@@ -843,7 +844,7 @@ pub struct TransactionProof {
 	// TODO: it's not really possible to provide this if the header is unknown.
 	pub env_info: EnvInfo,
 	/// Consensus engine.
-	pub engine: Arc<Engine>,
+	pub engine: Arc<EthEngine>,
 }
 
 impl TransactionProof {
@@ -858,7 +859,7 @@ impl TransactionProof {
 			state_items,
 			root,
 			&self.tx,
-			&*self.engine,
+			self.engine.machine(),
 			&self.env_info,
 		);
 
@@ -877,15 +878,15 @@ pub struct Signal {
 	/// Block hash and number to fetch proof for.
 	pub hash: H256,
 	/// Consensus engine, used to check the proof.
-	pub engine: Arc<Engine>,
+	pub engine: Arc<EthEngine>,
 	/// Special checker for the proof.
-	pub proof_check: Arc<StateDependentProof>,
+	pub proof_check: Arc<StateDependentProof<EthereumMachine>>,
 }
 
 impl Signal {
 	/// Check the signal, returning the signal or indicate that it's bad.
 	pub fn check_response(&self, _: &Mutex<::cache::Cache>, signal: &[u8]) -> Result<Vec<u8>, Error> {
-		self.proof_check.check_proof(&*self.engine, signal)
+		self.proof_check.check_proof(self.engine.machine(), signal)
 			.map(|_| signal.to_owned())
 			.map_err(|_| Error::BadProof)
 	}
@@ -904,7 +905,7 @@ mod tests {
 	use ethcore::client::{BlockChainClient, TestBlockChainClient, EachBlockWith};
 	use ethcore::header::Header;
 	use ethcore::encoded;
-	use ethcore::receipt::Receipt;
+	use ethcore::receipt::{Receipt, TransactionOutcome};
 
 	fn make_cache() -> ::cache::Cache {
 		::cache::Cache::new(Default::default(), ::time::Duration::seconds(1))

ethcore/res/constructor.json

@@ -1,7 +1,9 @@
 {
 	"name": "GenesisConstructor",
 	"engine": {
-		"null": null
+		"null": {
+			"params": {}
+		}
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",

ethcore/res/ethereum/byzantium_test.json

@@ -6,12 +6,12 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
+				"blockReward": "0x4563918244F40000",
 				"homesteadTransition": "0x0",
 				"eip150Transition": "0x0",
 				"eip160Transition": "0x0",
 				"eip161abcTransition": "0x0",
 				"eip161dTransition": "0x0",
-				"maxCodeSize": 24576,
 				"eip649Reward": "0x29A2241AF62C0000",
 				"eip100bTransition": "0x0",
 				"eip649Transition": "0x0"
@@ -20,12 +20,12 @@
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",
-		"blockReward": "0x4563918244F40000",
 		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 		"accountStartNonce": "0x00",
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
 		"networkID" : "0x1",
+		"maxCodeSize": 24576,
 		"eip98Transition": "0xffffffffffffffff",
 		"eip140Transition": "0x0",
 		"eip211Transition": "0x0",

ethcore/res/ethereum/classic.json

@@ -7,6 +7,7 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
+				"blockReward": "0x4563918244F40000",
 				"homesteadTransition": 1150000,
 				"eip150Transition": 2500000,
 				"eip160Transition": 3000000,
@@ -21,7 +22,6 @@
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",
-		"blockReward": "0x4563918244F40000",
 		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 		"accountStartNonce": "0x00",
 		"maximumExtraDataSize": "0x20",

ethcore/res/ethereum/constantinople_test.json

@@ -6,12 +6,12 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
+				"blockReward": "0x4563918244F40000",
 				"homesteadTransition": "0x0",
 				"eip150Transition": "0x0",
 				"eip160Transition": "0x0",
 				"eip161abcTransition": "0x0",
 				"eip161dTransition": "0x0",
-				"maxCodeSize": 24576,
 				"eip649Reward": "0x29A2241AF62C0000",
 				"eip100bTransition": "0x0",
 				"eip649Transition": "0x0"
@@ -20,12 +20,12 @@
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",
-		"blockReward": "0x4563918244F40000",
 		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 		"accountStartNonce": "0x00",
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
 		"networkID" : "0x1",
+		"maxCodeSize": 24576,
 		"eip98Transition": "0xffffffffffffffff",
 		"eip140Transition": "0x0",
 		"eip210Transition": "0x0",

ethcore/res/ethereum/eip150_test.json

@@ -6,26 +6,26 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
+				"blockReward": "0x4563918244F40000",
 				"homesteadTransition": "0x0",
 				"eip150Transition": "0x0",
 				"eip160Transition": "0x7fffffffffffffff",
 				"eip161abcTransition": "0x7fffffffffffffff",
-				"eip161dTransition": "0x7fffffffffffffff",
-				"maxCodeSize": 24576
+				"eip161dTransition": "0x7fffffffffffffff"
 			}
 		}
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",
-		"blockReward": "0x4563918244F40000",
 		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 		"accountStartNonce": "0x00",
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
 		"networkID" : "0x1",
 		"eip98Transition": "0x7fffffffffffffff",
 		"eip86Transition": "0x7fffffffffffffff",
-		"eip155Transition": "0x7fffffffffffffff"
+		"eip155Transition": "0x7fffffffffffffff",
+		"maxCodeSize": 24576
 	},
 	"genesis": {
 		"seal": {