Prepare for tx

berachain · May 16, 2023 · c02f397 · c02f397
1 parent 88564f8
commit c02f397
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/core/state/interface.go b/core/state/interface.go
@@ -71,7 +71,7 @@ type StateDBI interface {
  // AddSlotToAccessList adds the given (address,slot) to the access list. This operation is safe to perform
  // even if the feature/fork is not active yet
  AddSlotToAccessList(addr common.Address, slot common.Hash)
- Prepare(rules params.Rules, sender, coinbase common.Address, dest *common.Address, precompiles []common.Address, txAccesses types.AccessList)
+ PrepareForTx(rules params.Rules, sender, coinbase common.Address, dest *common.Address, precompiles []common.Address, txAccesses types.AccessList)
 
  RevertToSnapshot(int)
  Snapshot() int

diff --git a/core/state/statedb.go b/core/state/statedb.go
@@ -1080,7 +1080,7 @@ func (s *StateDB) Commit(deleteEmptyObjects bool) (common.Hash, error) {
  return root, nil
 }
 
-// Prepare handles the preparatory steps for executing a state transition with.
+// PrepareForTx handles the preparatory steps for executing a state transition with.
 // This method must be invoked before state transition.
 //
 // Berlin fork:
@@ -1093,7 +1093,7 @@ func (s *StateDB) Commit(deleteEmptyObjects bool) (common.Hash, error) {
 // - Reset access list (Berlin)
 // - Add coinbase to access list (EIP-3651)
 // - Reset transient storage (EIP-1153)
-func (s *StateDB) Prepare(rules params.Rules, sender, coinbase common.Address, dst *common.Address, precompiles []common.Address, list types.AccessList) {
+func (s *StateDB) PrepareForTx(rules params.Rules, sender, coinbase common.Address, dst *common.Address, precompiles []common.Address, list types.AccessList) {
  if rules.IsBerlin {
  // Clear out any leftover from previous executions
  al := NewAccessList()

diff --git a/core/state_transition.go b/core/state_transition.go
@@ -361,7 +361,7 @@ func (st *StateTransition) TransitionDb() (*ExecutionResult, error) {
  // Execute the preparatory steps for state transition which includes:
  // - prepare accessList(post-berlin)
  // - reset transient storage(eip 1153)
- st.state.Prepare(rules, msg.From, st.evm.Context.Coinbase, msg.To, st.evm.PrecompileManager.GetActive(&rules), msg.AccessList)
+ st.state.PrepareForTx(rules, msg.From, st.evm.Context.Coinbase, msg.To, st.evm.PrecompileManager.GetActive(&rules), msg.AccessList)
 
  var (
  ret []byte

diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go
@@ -118,7 +118,7 @@ func Execute(code, input []byte, cfg *Config) ([]byte, state.StateDBI, error) {
  // Execute the preparatory steps for state transition which includes:
  // - prepare accessList(post-berlin)
  // - reset transient storage(eip 1153)
- cfg.State.Prepare(rules, cfg.Origin, cfg.Coinbase, &address, vmenv.PrecompileManager.GetActive(&rules), nil)
+ cfg.State.PrepareForTx(rules, cfg.Origin, cfg.Coinbase, &address, vmenv.PrecompileManager.GetActive(&rules), nil)
  cfg.State.CreateAccount(address)
  // set the receiver's (the executing contract) code for execution.
  cfg.State.SetCode(address, code)
@@ -151,7 +151,7 @@ func Create(input []byte, cfg *Config) ([]byte, common.Address, uint64, error) {
  // Execute the preparatory steps for state transition which includes:
  // - prepare accessList(post-berlin)
  // - reset transient storage(eip 1153)
- cfg.State.Prepare(rules, cfg.Origin, cfg.Coinbase, nil, vmenv.PrecompileManager.GetActive(&rules), nil)
+ cfg.State.PrepareForTx(rules, cfg.Origin, cfg.Coinbase, nil, vmenv.PrecompileManager.GetActive(&rules), nil)
  // Call the code with the given configuration.
  code, address, leftOverGas, err := vmenv.Create(
  sender,
@@ -179,7 +179,7 @@ func Call(address common.Address, input []byte, cfg *Config) ([]byte, uint64, er
  // Execute the preparatory steps for state transition which includes:
  // - prepare accessList(post-berlin)
  // - reset transient storage(eip 1153)
- statedb.Prepare(rules, cfg.Origin, cfg.Coinbase, &address, vmenv.PrecompileManager.GetActive(&rules), nil)
+ statedb.PrepareForTx(rules, cfg.Origin, cfg.Coinbase, &address, vmenv.PrecompileManager.GetActive(&rules), nil)
 
  // Call the code with the given configuration.
  ret, leftOverGas, err := vmenv.Call(

diff --git a/tests/state_test.go b/tests/state_test.go
@@ -239,7 +239,7 @@ func runBenchmark(b *testing.B, t *StateTest) {
  b.ResetTimer()
  for n := 0; n < b.N; n++ {
  snapshot := statedb.Snapshot()
- statedb.Prepare(rules, msg.From, context.Coinbase, msg.To, evm.PrecompileManager.GetActive(&rules), msg.AccessList)
+ statedb.PrepareForTx(rules, msg.From, context.Coinbase, msg.To, evm.PrecompileManager.GetActive(&rules), msg.AccessList)
  b.StartTimer()
  start := time.Now()