From b44a24346962c6e1c397dab673e10499546d1dc0 Mon Sep 17 00:00:00 2001
From: Wei Tang <wei@pacna.org>
Date: Thu, 23 Nov 2023 02:53:11 +0100
Subject: [PATCH] Expose parent machine information in substate creation

---
 src/standard/invoker/mod.rs      | 38 ++++++++++++++++++--------------
 src/standard/invoker/routines.rs | 15 ++++++-------
 src/standard/mod.rs              | 10 +++++----
 3 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/standard/invoker/mod.rs b/src/standard/invoker/mod.rs
index 39b3fd7ef..b51772253 100644
--- a/src/standard/invoker/mod.rs
+++ b/src/standard/invoker/mod.rs
@@ -178,7 +178,7 @@ impl<'config, 'precompile, 'etable, S, G, H, Pre, Tr, F>
 impl<'config, 'precompile, 'etable, S, G, H, Pre, Tr, F> InvokerT<H, Tr>
 	for Invoker<'config, 'precompile, 'etable, S, G, H, Pre, Tr, F>
 where
-	S: MergeableRuntimeState,
+	S: MergeableRuntimeState<GasedMachine<S, G>>,
 	G: GasometerT<S, H> + TransactGasometer<'config, S>,
 	H: RuntimeEnvironment + RuntimeBackend + TransactionalBackend,
 	Pre: CodeResolver<S, G, H>,
@@ -506,12 +506,15 @@ where
 					submeter.analyse_code(&code);
 				}
 
-				let substate = machine.machine.state.substate(RuntimeState {
-					context: call_trap_data.context.clone(),
-					transaction_context,
-					retbuf: Vec::new(),
-					gas: U256::from(gas_limit),
-				});
+				let substate = machine.machine.state.substate(
+					RuntimeState {
+						context: call_trap_data.context.clone(),
+						transaction_context,
+						retbuf: Vec::new(),
+						gas: U256::from(gas_limit),
+					},
+					&machine,
+				);
 
 				Capture::Exit(routines::enter_call_substack(
 					self.config,
@@ -533,16 +536,19 @@ where
 
 				let caller = create_trap_data.scheme.caller();
 				let address = create_trap_data.scheme.address(handler);
-				let substate = machine.machine.state.substate(RuntimeState {
-					context: Context {
-						address,
-						caller,
-						apparent_value: create_trap_data.value,
+				let substate = machine.machine.state.substate(
+					RuntimeState {
+						context: Context {
+							address,
+							caller,
+							apparent_value: create_trap_data.value,
+						},
+						transaction_context,
+						retbuf: Vec::new(),
+						gas: U256::from(gas_limit),
 					},
-					transaction_context,
-					retbuf: Vec::new(),
-					gas: U256::from(gas_limit),
-				});
+					&machine,
+				);
 
 				Capture::Exit(
 					routines::enter_create_substack(
diff --git a/src/standard/invoker/routines.rs b/src/standard/invoker/routines.rs
index b64f6f37d..ae4ee6ff1 100644
--- a/src/standard/invoker/routines.rs
+++ b/src/standard/invoker/routines.rs
@@ -1,9 +1,9 @@
 use super::{CallTrapData, CreateTrapData, Precompile, ResolvedCode, SubstackInvoke};
-use crate::standard::{Config, MergeableRuntimeState};
+use crate::standard::Config;
 use crate::{
 	ExitError, ExitException, ExitResult, GasedMachine, Gasometer as GasometerT, InvokerControl,
-	Machine, MergeStrategy, Opcode, RuntimeBackend, RuntimeEnvironment, StaticGasometer,
-	TransactionalBackend, Transfer,
+	Machine, MergeStrategy, Opcode, RuntimeBackend, RuntimeEnvironment, RuntimeState,
+	StaticGasometer, TransactionalBackend, Transfer,
 };
 use alloc::rc::Rc;
 use primitive_types::{H160, U256};
@@ -19,7 +19,7 @@ pub fn make_enter_call_machine<'config, 'precompile, S, G, H, P>(
 	handler: &mut H,
 ) -> Result<InvokerControl<GasedMachine<S, G>, (ExitResult, (S, G, Vec<u8>))>, ExitError>
 where
-	S: MergeableRuntimeState,
+	S: AsRef<RuntimeState>,
 	G: GasometerT<S, H>,
 	H: RuntimeEnvironment + RuntimeBackend + TransactionalBackend,
 	P: Precompile<S, G, H>,
@@ -67,7 +67,7 @@ pub fn make_enter_create_machine<'config, S, G, H>(
 	handler: &mut H,
 ) -> Result<GasedMachine<S, G>, ExitError>
 where
-	S: MergeableRuntimeState,
+	S: AsRef<RuntimeState>,
 	G: GasometerT<S, H>,
 	H: RuntimeEnvironment + RuntimeBackend + TransactionalBackend,
 {
@@ -125,7 +125,7 @@ pub fn enter_call_substack<'config, 'precompile, S, G, H, P>(
 	ExitError,
 >
 where
-	S: MergeableRuntimeState,
+	S: AsRef<RuntimeState>,
 	G: GasometerT<S, H>,
 	H: RuntimeEnvironment + RuntimeBackend + TransactionalBackend,
 	P: Precompile<S, G, H>,
@@ -166,7 +166,7 @@ pub fn enter_create_substack<'config, S, G, H>(
 	handler: &mut H,
 ) -> Result<(SubstackInvoke, GasedMachine<S, G>), ExitError>
 where
-	S: MergeableRuntimeState,
+	S: AsRef<RuntimeState>,
 	G: GasometerT<S, H>,
 	H: RuntimeEnvironment + RuntimeBackend + TransactionalBackend,
 {
@@ -225,7 +225,6 @@ pub fn deploy_create_code<'config, S, G, H>(
 	handler: &mut H,
 ) -> Result<(), ExitError>
 where
-	S: MergeableRuntimeState,
 	G: GasometerT<S, H>,
 	H: RuntimeEnvironment + RuntimeBackend + TransactionalBackend,
 {
diff --git a/src/standard/mod.rs b/src/standard/mod.rs
index 7ce44ead7..3fecb7d72 100644
--- a/src/standard/mod.rs
+++ b/src/standard/mod.rs
@@ -11,15 +11,17 @@ pub type Efn<H> = crate::Efn<crate::RuntimeState, H, crate::Opcode>;
 pub type Etable<H, F = Efn<H>> = crate::Etable<crate::RuntimeState, H, crate::Opcode, F>;
 pub type GasedMachine<G> = crate::GasedMachine<crate::RuntimeState, G>;
 
-pub trait MergeableRuntimeState: AsRef<crate::RuntimeState> + AsMut<crate::RuntimeState> {
-	fn substate(&self, runtime: crate::RuntimeState) -> Self;
+pub trait MergeableRuntimeState<M>:
+	AsRef<crate::RuntimeState> + AsMut<crate::RuntimeState>
+{
+	fn substate(&self, runtime: crate::RuntimeState, parent: &M) -> Self;
 	fn merge(&mut self, substate: Self, strategy: crate::MergeStrategy);
 	fn new_transact_call(runtime: crate::RuntimeState) -> Self;
 	fn new_transact_create(runtime: crate::RuntimeState) -> Self;
 }
 
-impl MergeableRuntimeState for crate::RuntimeState {
-	fn substate(&self, runtime: crate::RuntimeState) -> Self {
+impl<M> MergeableRuntimeState<M> for crate::RuntimeState {
+	fn substate(&self, runtime: crate::RuntimeState, _parent: &M) -> Self {
 		runtime
 	}
 	fn merge(&mut self, _substate: Self, _strategy: crate::MergeStrategy) {}