From 95756c88574771ddcfd2c116dcda4c938251ba02 Mon Sep 17 00:00:00 2001
From: Alex Sharov <AskAlexSharov@gmail.com>
Date: Sat, 3 Jul 2021 19:55:23 +0700
Subject: [PATCH] less objects (#2287)
---
turbo/transactions/tracing.go | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/turbo/transactions/tracing.go b/turbo/transactions/tracing.go
index 4c5b28f1f7..1ccc0da597 100644
--- a/turbo/transactions/tracing.go
+++ b/turbo/transactions/tracing.go
@@ -47,6 +47,9 @@ func ComputeTxEnv(ctx context.Context, block *types.Block, cfg *params.ChainConf
// Recompute transactions up to the target index.
signer := types.MakeSigner(cfg, block.NumberU64())
+ BlockContext := core.NewEVMBlockContext(block.Header(), getHeader, engine, nil, checkTEVM)
+ vmenv := vm.NewEVM(BlockContext, vm.TxContext{}, statedb, cfg, vm.Config{})
+ ctx = vmenv.ChainConfig().WithEIPsFlags(ctx, block.NumberU64())
for idx, tx := range block.Transactions() {
select {
default:
@@ -57,19 +60,18 @@ func ComputeTxEnv(ctx context.Context, block *types.Block, cfg *params.ChainConf
// Assemble the transaction call message and return if the requested offset
msg, _ := tx.AsMessage(*signer, block.Header().BaseFee)
- BlockContext := core.NewEVMBlockContext(block.Header(), getHeader, engine, nil, checkTEVM)
TxContext := core.NewEVMTxContext(msg)
if idx == int(txIndex) {
return msg, BlockContext, TxContext, statedb, reader, nil
}
+ vmenv.Reset(TxContext, statedb)
// Not yet the searched for transaction, execute on top of the current state
- vmenv := vm.NewEVM(BlockContext, TxContext, statedb, cfg, vm.Config{})
if _, err := core.ApplyMessage(vmenv, msg, new(core.GasPool).AddGas(tx.GetGas()), true /* refunds */, false /* gasBailout */); err != nil {
return nil, vm.BlockContext{}, vm.TxContext{}, nil, nil, fmt.Errorf("transaction %x failed: %v", tx.Hash(), err)
}
// Ensure any modifications are committed to the state
// Only delete empty objects if EIP158/161 (a.k.a Spurious Dragon) is in effect
- _ = statedb.FinalizeTx(vmenv.ChainConfig().WithEIPsFlags(context.Background(), block.NumberU64()), state.NewNoopWriter())
+ _ = statedb.FinalizeTx(ctx, state.NewNoopWriter())
}
return nil, vm.BlockContext{}, vm.TxContext{}, nil, nil, fmt.Errorf("transaction index %d out of range for block %x", txIndex, blockHash)
}
--
GitLab