CLI option for using JITEVM (#1103)

* easily configurable vm (in progress)

* completely removed vm_factory from engine

* --jitvm command line flag

ethcore/src/client/client.rs

@@ -46,6 +46,7 @@ use trace::{TraceDB, ImportRequest as TraceImportRequest, LocalizedTrace, Databa
 use trace;
 pub use types::blockchain_info::BlockChainInfo;
 pub use types::block_status::BlockStatus;
+use evm::Factory as EvmFactory;
 
 impl fmt::Display for BlockChainInfo {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -87,6 +88,7 @@ pub struct Client<V = CanonVerifier> where V: Verifier {
 	import_lock: Mutex<()>,
 	panic_handler: Arc<PanicHandler>,
 	verifier: PhantomData<V>,
+	vm_factory: Arc<EvmFactory>,
 }
 
 const HISTORY: u64 = 1200;
@@ -151,6 +153,7 @@ impl<V> Client<V> where V: Verifier {
 			import_lock: Mutex::new(()),
 			panic_handler: panic_handler,
 			verifier: PhantomData,
+			vm_factory: Arc::new(EvmFactory::new(config.vm_type)),
 		})
 	}
 
@@ -204,7 +207,7 @@ impl<V> Client<V> where V: Verifier {
 		let last_hashes = self.build_last_hashes(header.parent_hash.clone());
 		let db = self.state_db.lock().unwrap().boxed_clone();
 
-		let enact_result = enact_verified(&block, engine, self.tracedb.tracing_enabled(), db, &parent, last_hashes);
+		let enact_result = enact_verified(&block, engine, self.tracedb.tracing_enabled(), db, &parent, last_hashes, &self.vm_factory);
 		if let Err(e) = enact_result {
 			warn!(target: "client", "Block import failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
 			return Err(());
@@ -422,7 +425,7 @@ impl<V> BlockChainClient for Client<V> where V: Verifier {
 		state.sub_balance(&sender, &balance);
 		state.add_balance(&sender, &U256::max_value());
 		let options = TransactOptions { tracing: false, check_nonce: false };
-		Executive::new(&mut state, &env_info, self.engine.deref().deref()).transact(t, options)
+		Executive::new(&mut state, &env_info, self.engine.deref().deref(), &self.vm_factory).transact(t, options)
 	}
 
 	// TODO [todr] Should be moved to miner crate eventually.
@@ -434,6 +437,10 @@ impl<V> BlockChainClient for Client<V> where V: Verifier {
 		self.engine.deref().deref()
 	}
 
+	fn vm_factory(&self) -> &EvmFactory {
+		&self.vm_factory
+	}
+
 	// TODO [todr] Should be moved to miner crate eventually.
 	fn prepare_sealing(&self, author: Address, gas_floor_target: U256, extra_data: Bytes, transactions: Vec<SignedTransaction>)
 		-> (Option<ClosedBlock>, HashSet<H256>) {
@@ -443,6 +450,7 @@ impl<V> BlockChainClient for Client<V> where V: Verifier {
 
 		let mut b = OpenBlock::new(
 			engine,
+			&self.vm_factory,
 			false,	// TODO: this will need to be parameterised once we want to do immediate mining insertion.
 			self.state_db.lock().unwrap().boxed_clone(),
 			match self.chain.block_header(&h) { Some(ref x) => x, None => { return (None, invalid_transactions) } },

ethcore/src/client/config.rs

@@ -17,6 +17,7 @@
 pub use block_queue::BlockQueueConfig;
 pub use blockchain::BlockChainConfig;
 pub use trace::{Config as TraceConfig, Switch};
+pub use evm::VMType;
 use util::journaldb;
 
 /// Client configuration. Includes configs for all sub-systems.
@@ -28,6 +29,8 @@ pub struct ClientConfig {
 	pub blockchain: BlockChainConfig,
 	/// Trace configuration.
 	pub tracing: TraceConfig,
+	/// VM type.
+	pub vm_type: VMType,
 	/// The JournalDB ("pruning") algorithm to use.
 	pub pruning: journaldb::Algorithm,
 	/// The name of the client instance.

ethcore/src/client/mod.rs

@@ -22,7 +22,7 @@ mod test_client;
 mod trace;
 
 pub use self::client::*;
-pub use self::config::{ClientConfig, BlockQueueConfig, BlockChainConfig, Switch};
+pub use self::config::{ClientConfig, BlockQueueConfig, BlockChainConfig, Switch, VMType};
 pub use types::ids::*;
 pub use self::test_client::{TestBlockChainClient, EachBlockWith};
 pub use self::trace::Filter as TraceFilter;
@@ -45,6 +45,7 @@ use error::{ImportResult, ExecutionError};
 use receipt::LocalizedReceipt;
 use engine::{Engine};
 use trace::LocalizedTrace;
+use evm::Factory as EvmFactory;
 
 /// Blockchain database client. Owns and manages a blockchain and a block queue.
 pub trait BlockChainClient : Sync + Send {
@@ -140,6 +141,9 @@ pub trait BlockChainClient : Sync + Send {
 	/// Executes a function providing it with a reference to an engine.
 	fn engine(&self) -> &Engine;
 
+	/// Returns EvmFactory.
+	fn vm_factory(&self) -> &EvmFactory;
+
 	/// Returns traces matching given filter.
 	fn filter_traces(&self, filter: TraceFilter) -> Option<Vec<LocalizedTrace>>;
 

ethcore/src/client/test_client.rs

@@ -27,6 +27,7 @@ use log_entry::LocalizedLogEntry;
 use receipt::{Receipt, LocalizedReceipt};
 use extras::BlockReceipts;
 use error::{ImportResult};
+use evm::Factory as EvmFactory;
 
 use block_queue::BlockQueueInfo;
 use block::{SealedBlock, ClosedBlock, LockedBlock};
@@ -434,6 +435,10 @@ impl BlockChainClient for TestBlockChainClient {
 		unimplemented!();
 	}
 
+	fn vm_factory(&self) -> &EvmFactory {
+		unimplemented!();
+	}
+
 	fn filter_traces(&self, _filter: TraceFilter) -> Option<Vec<LocalizedTrace>> {
 		unimplemented!();
 	}