Allow specifying the caller in set_code function (#291)

* add caller parameter to set_code function

* fmt

* add SetCodeOrigin enum

Author: Agusrodri

interpreter/src/runtime.rs

@@ -77,6 +77,13 @@ pub struct Log {
 	pub data: Vec<u8>,
 }
 
+// Identify if the origin of set_code() comes from a transact or subcall.
+#[derive(Clone, Debug)]
+pub enum SetCodeOrigin {
+	Transaction,
+	Subcall(H160),
+}
+
 #[auto_impl::auto_impl(&, Box)]
 pub trait RuntimeEnvironment {
 	/// Get environmental block hash.
@@ -156,7 +163,12 @@ pub trait RuntimeBackend: RuntimeBaseBackend {
 	/// Fully delete storages of an account.
 	fn reset_storage(&mut self, address: H160);
 	/// Set code of an account.
-	fn set_code(&mut self, address: H160, code: Vec<u8>) -> Result<(), ExitError>;
+	fn set_code(
+		&mut self,
+		address: H160,
+		code: Vec<u8>,
+		origin: SetCodeOrigin,
+	) -> Result<(), ExitError>;
 	/// Reset balance of an account.
 	fn reset_balance(&mut self, address: H160);
 	fn deposit(&mut self, target: H160, value: U256);

interpreter/tests/usability.rs

@@ -7,7 +7,7 @@ use evm_interpreter::{
 	opcode::Opcode,
 	runtime::{
 		Context, Log, RuntimeBackend, RuntimeBaseBackend, RuntimeEnvironment, RuntimeState,
-		TransactionContext,
+		SetCodeOrigin, TransactionContext,
 	},
 	EtableInterpreter, RunInterpreter,
 };
@@ -165,7 +165,12 @@ impl RuntimeBackend for UnimplementedHandler {
 		unimplemented!()
 	}
 
-	fn set_code(&mut self, _address: H160, _code: Vec<u8>) -> Result<(), ExitError> {
+	fn set_code(
+		&mut self,
+		_address: H160,
+		_code: Vec<u8>,
+		_origin: SetCodeOrigin,
+	) -> Result<(), ExitError> {
 		unimplemented!()
 	}
 

src/backend/overlayed.rs

@@ -7,7 +7,7 @@ use core::mem;
 
 use evm_interpreter::{
 	error::{ExitError, ExitException},
-	runtime::{Log, RuntimeBackend, RuntimeBaseBackend, RuntimeEnvironment},
+	runtime::{Log, RuntimeBackend, RuntimeBaseBackend, RuntimeEnvironment, SetCodeOrigin},
 };
 use primitive_types::{H160, H256, U256};
 
@@ -192,7 +192,12 @@ impl<B: RuntimeBaseBackend> RuntimeBackend for OverlayedBackend<B> {
 		self.substate.storage_resets.insert(address);
 	}
 
-	fn set_code(&mut self, address: H160, code: Vec<u8>) -> Result<(), ExitError> {
+	fn set_code(
+		&mut self,
+		address: H160,
+		code: Vec<u8>,
+		_origin: SetCodeOrigin,
+	) -> Result<(), ExitError> {
 		self.substate.codes.insert(address, code);
 		Ok(())
 	}

src/standard/invoker/mod.rs

@@ -12,8 +12,8 @@ use evm_interpreter::{
 	},
 	opcode::Opcode,
 	runtime::{
-		Context, GasState, RuntimeBackend, RuntimeEnvironment, RuntimeState, TransactionContext,
-		Transfer,
+		Context, GasState, RuntimeBackend, RuntimeEnvironment, RuntimeState, SetCodeOrigin,
+		TransactionContext, Transfer,
 	},
 	Interpreter,
 };
@@ -375,6 +375,7 @@ where
 							retbuf,
 							&mut substate,
 							handler,
+							SetCodeOrigin::Transaction,
 						)?;
 
 						Ok(TransactValue::Create {
@@ -564,6 +565,7 @@ where
 		match trap_data {
 			SubstackInvoke::Create { address, trap } => {
 				let retbuf = retval;
+				let caller = trap.scheme.caller();
 
 				let result = result.and_then(|_| {
 					routines::deploy_create_code(
@@ -572,6 +574,7 @@ where
 						retbuf.clone(),
 						&mut substate,
 						handler,
+						SetCodeOrigin::Subcall(caller),
 					)?;
 
 					Ok(address)

src/standard/invoker/routines.rs

@@ -3,7 +3,7 @@ use alloc::vec::Vec;
 use evm_interpreter::{
 	error::{CallTrapData, CreateTrapData, ExitError, ExitException, ExitResult},
 	opcode::Opcode,
-	runtime::{RuntimeBackend, RuntimeEnvironment, RuntimeState, Transfer},
+	runtime::{RuntimeBackend, RuntimeEnvironment, RuntimeState, SetCodeOrigin, Transfer},
 };
 use primitive_types::{H160, U256};
 
@@ -197,6 +197,7 @@ pub fn deploy_create_code<'config, S, H>(
 	retbuf: Vec<u8>,
 	state: &mut S,
 	handler: &mut H,
+	origin: SetCodeOrigin,
 ) -> Result<(), ExitError>
 where
 	S: InvokerState<'config>,
@@ -212,7 +213,7 @@ where
 
 	state.record_codedeposit(retbuf.len())?;
 
-	handler.set_code(address, retbuf)?;
+	handler.set_code(address, retbuf, origin)?;
 
 	Ok(())
 }