Analyse code after machine creation (#233)

Author: sorpaas

interpreter/src/lib.rs

@@ -58,6 +58,10 @@ impl<S> Machine<S> {
 		self.position
 	}
 
+	pub fn code(&self) -> &[u8] {
+		&self.code
+	}
+
 	/// Create a new machine with given code and data.
 	pub fn new(
 		code: Rc<Vec<u8>>,

src/standard/invoker/mod.rs

@@ -307,11 +307,8 @@ where
 					let mut gasometer =
 						G::new_transact_call(gas_limit, &data, &access_list, self.config)?;
 					let code = self.resolver.resolve(address, &mut gasometer, handler)?;
-					if let ResolvedCode::Normal(code) = &code {
-						gasometer.analyse_code(&code);
-					}
 
-					let machine = routines::make_enter_call_machine(
+					let mut machine = routines::make_enter_call_machine(
 						self.config,
 						code,
 						data,
@@ -326,6 +323,7 @@ where
 						gasometer,
 						handler,
 					)?;
+					routines::maybe_analyse_code(&mut machine);
 
 					if self.config.increase_state_access_gas {
 						if self.config.warm_coinbase_address {
@@ -345,11 +343,10 @@ where
 					access_list,
 					..
 				} => {
-					let mut gasometer =
+					let gasometer =
 						G::new_transact_create(gas_limit, &init_code, &access_list, self.config)?;
-					gasometer.analyse_code(&init_code);
 
-					let machine = InvokerControl::Enter(routines::make_enter_create_machine(
+					let mut machine = routines::make_enter_create_machine(
 						self.config,
 						caller,
 						init_code,
@@ -363,7 +360,8 @@ where
 						}),
 						gasometer,
 						handler,
-					)?);
+					)?;
+					routines::maybe_analyse_code(&mut machine);
 
 					Ok((invoke, machine))
 				}
@@ -502,9 +500,6 @@ where
 						Ok(code) => code,
 						Err(err) => return Capture::Exit(Err(err)),
 					};
-				if let ResolvedCode::Normal(code) = &code {
-					submeter.analyse_code(&code);
-				}
 
 				let substate = machine.machine.state.substate(
 					RuntimeState {
@@ -528,11 +523,10 @@ where
 			}
 			CallCreateTrapData::Create(create_trap_data) => {
 				let code = create_trap_data.code.clone();
-				let mut submeter = match machine.gasometer.submeter(gas_limit, call_has_value) {
+				let submeter = match machine.gasometer.submeter(gas_limit, call_has_value) {
 					Ok(submeter) => submeter,
 					Err(err) => return Capture::Exit(Err(err)),
 				};
-				submeter.analyse_code(&code);
 
 				let caller = create_trap_data.scheme.caller();
 				let address = create_trap_data.scheme.address(handler);
@@ -550,18 +544,15 @@ where
 					&machine,
 				);
 
-				Capture::Exit(
-					routines::enter_create_substack(
-						self.config,
-						code,
-						create_trap_data,
-						is_static,
-						substate,
-						submeter,
-						handler,
-					)
-					.map(|(invoke, machine)| (invoke, InvokerControl::Enter(machine))),
-				)
+				Capture::Exit(routines::enter_create_substack(
+					self.config,
+					code,
+					create_trap_data,
+					is_static,
+					substate,
+					submeter,
+					handler,
+				))
 			}
 		}
 	}

src/standard/invoker/routines.rs

@@ -1,4 +1,6 @@
-use super::{CallTrapData, CreateTrapData, Precompile, ResolvedCode, SubstackInvoke};
+use super::{
+	CallTrapData, CreateTrapData, Precompile, ResolvedCode, SubstackInvoke, TransactGasometer,
+};
 use crate::standard::Config;
 use crate::{
 	ExitError, ExitException, ExitResult, GasedMachine, Gasometer as GasometerT, InvokerControl,
@@ -8,6 +10,14 @@ use crate::{
 use alloc::rc::Rc;
 use primitive_types::{H160, U256};
 
+pub fn maybe_analyse_code<'config, S: AsRef<RuntimeState>, G: TransactGasometer<'config, S>>(
+	result: &mut InvokerControl<GasedMachine<S, G>, (ExitResult, (S, G, Vec<u8>))>,
+) {
+	if let InvokerControl::Enter(machine) = result {
+		machine.gasometer.analyse_code(&machine.machine.code())
+	}
+}
+
 pub fn make_enter_call_machine<'config, 'precompile, S, G, H, P>(
 	config: &'config Config,
 	code: ResolvedCode<P>,
@@ -61,7 +71,7 @@ pub fn make_enter_create_machine<'config, S, G, H>(
 	state: S,
 	gasometer: G,
 	handler: &mut H,
-) -> Result<GasedMachine<S, G>, ExitError>
+) -> Result<InvokerControl<GasedMachine<S, G>, (ExitResult, (S, G, Vec<u8>))>, ExitError>
 where
 	S: AsRef<RuntimeState>,
 	G: GasometerT<S, H>,
@@ -98,11 +108,11 @@ where
 		state,
 	);
 
-	Ok(GasedMachine {
+	Ok(InvokerControl::Enter(GasedMachine {
 		machine,
 		gasometer,
 		is_static,
-	})
+	}))
 }
 
 pub fn enter_call_substack<'config, 'precompile, S, G, H, P>(
@@ -122,14 +132,14 @@ pub fn enter_call_substack<'config, 'precompile, S, G, H, P>(
 >
 where
 	S: AsRef<RuntimeState>,
-	G: GasometerT<S, H>,
+	G: GasometerT<S, H> + TransactGasometer<'config, S>,
 	H: RuntimeEnvironment + RuntimeBackend + TransactionalBackend,
 	P: Precompile<S, G, H>,
 {
 	handler.push_substate();
 
 	let work = || -> Result<(SubstackInvoke, _), ExitError> {
-		let machine = make_enter_call_machine(
+		let mut machine = make_enter_call_machine(
 			config,
 			code,
 			trap_data.input.clone(),
@@ -139,6 +149,7 @@ where
 			gasometer,
 			handler,
 		)?;
+		maybe_analyse_code(&mut machine);
 
 		Ok((SubstackInvoke::Call { trap: trap_data }, machine))
 	};
@@ -160,15 +171,21 @@ pub fn enter_create_substack<'config, S, G, H>(
 	state: S,
 	gasometer: G,
 	handler: &mut H,
-) -> Result<(SubstackInvoke, GasedMachine<S, G>), ExitError>
+) -> Result<
+	(
+		SubstackInvoke,
+		InvokerControl<GasedMachine<S, G>, (ExitResult, (S, G, Vec<u8>))>,
+	),
+	ExitError,
+>
 where
 	S: AsRef<RuntimeState>,
-	G: GasometerT<S, H>,
+	G: GasometerT<S, H> + TransactGasometer<'config, S>,
 	H: RuntimeEnvironment + RuntimeBackend + TransactionalBackend,
 {
 	handler.push_substate();
 
-	let work = || -> Result<(SubstackInvoke, GasedMachine<S, G>), ExitError> {
+	let work = || -> Result<(SubstackInvoke, InvokerControl<GasedMachine<S, G>, (ExitResult, (S, G, Vec<u8>))>), ExitError> {
 		let CreateTrapData {
 			scheme,
 			value,
@@ -184,9 +201,10 @@ where
 			value,
 		};
 
-		let machine = make_enter_create_machine(
+		let mut machine = make_enter_create_machine(
 			config, caller, code, is_static, transfer, state, gasometer, handler,
 		)?;
+		maybe_analyse_code(&mut machine);
 
 		Ok((
 			SubstackInvoke::Create {