Manual touches to modify types to conform to geth v1.11.1

core/plugin_hooks.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"math/big"
 	"reflect"
-	"time"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/state"
@@ -250,9 +249,9 @@ func (mt *metaTracer) CaptureFault(pc uint64, op vm.OpCode, gas, cost uint64, sc
 		tracer.CaptureFault(pc, core.OpCode(op), gas, cost, wrappers.NewWrappedScopeContext(scope), depth, err)
 	}
 }
-func (mt *metaTracer) CaptureEnd(output []byte, gasUsed uint64, t time.Duration, err error) {
+func (mt *metaTracer) CaptureEnd(output []byte, gasUsed uint64, err error) {
 	for _, tracer := range mt.tracers {
-		tracer.CaptureEnd(output, gasUsed, t, err)
+		tracer.CaptureEnd(output, gasUsed, err)
 	}
 }
 

core/state/statedb.go

@@ -164,7 +164,7 @@ func New(root common.Hash, db Database, snaps *snapshot.Tree) (*StateDB, error)
 	if sdb.snap == nil {
 		log.Debug("Snapshots not availble. Using plugin snapshot.")
 		sdb.snap = &pluginSnapshot{root}
-		sdb.snapDestructs = make(map[common.Hash]struct{})
+		sdb.stateObjectsDestruct = make(map[common.Address]struct{})
 		sdb.snapAccounts = make(map[common.Hash][]byte)
 		sdb.snapStorage = make(map[common.Hash]map[common.Hash][]byte)
 	}
@@ -988,7 +988,7 @@ func (s *StateDB) Commit(deleteEmptyObjects bool) (common.Hash, error) {
 	// begin PluGeth injection
 	codeUpdates := make(map[common.Hash][]byte)
 	// end PluGeth injection
-	codeWriter := s.db.TrieDB().DiskDB().NewBatch()
+	codeWriter := s.db.DiskDB().NewBatch()
 	for addr := range s.stateObjectsDirty {
 		if obj := s.stateObjects[addr]; !obj.deleted {
 			// Write any contract code associated with the state object
@@ -1062,10 +1062,10 @@ func (s *StateDB) Commit(deleteEmptyObjects bool) (common.Hash, error) {
 		// Only update if there's a state transition (skip empty Clique blocks)
 		if parent := s.snap.Root(); parent != root {
 			//begin PluGeth code injection
-			pluginStateUpdate(root, parent, s.snapDestructs, s.snapAccounts, s.snapStorage, codeUpdates)
+			pluginStateUpdate(root, parent, s.convertAccountSet(s.stateObjectsDestruct), s.snapAccounts, s.snapStorage, codeUpdates)
 			if _, ok := s.snap.(*pluginSnapshot); !ok && s.snaps != nil { // This if statement (but not its content) was added by PluGeth
 			//end PluGeth injection
-				if err := s.snaps.Update(root, parent, s.snapDestructs, s.snapAccounts, s.snapStorage); err != nil {
+				if err := s.snaps.Update(root, parent, s.convertAccountSet(s.stateObjectsDestruct), s.snapAccounts, s.snapStorage); err != nil {
 					log.Warn("Failed to update snapshot tree", "from", parent, "to", root, "err", err)
 				}
 				// Keep 128 diff layers in the memory, persistent layer is 129th.

core/state_processor.go

@@ -77,28 +77,39 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
 		cfg.Tracer = blockTracer
 		cfg.Debug = true
 	}
+	// end pluGeth code injection
 	vmenv := vm.NewEVM(blockContext, vm.TxContext{}, statedb, p.config, cfg)
-	// Iterate over and process the individual transactions
+	// begin PluGeth code injection
 	pluginPreProcessBlock(block)
 	blockTracer.PreProcessBlock(block)
+	// end PluGeth code injection
+	// Iterate over and process the individual transactions
 	for i, tx := range block.Transactions() {
 		msg, err := tx.AsMessage(types.MakeSigner(p.config, header.Number), header.BaseFee)
 		if err != nil {
+			// begin PluGeth injection
 			pluginBlockProcessingError(tx, block, err)
 			blockTracer.BlockProcessingError(tx, block, err)
+			// end PluGeth injection
 			return nil, nil, 0, fmt.Errorf("could not apply tx %d [%v]: %w", i, tx.Hash().Hex(), err)
 		}
-		statedb.Prepare(tx.Hash(), i)
+		statedb.SetTxContext(tx.Hash(), i)
+		// begin PluGeth injection
 		pluginPreProcessTransaction(tx, block, i)
 		blockTracer.PreProcessTransaction(tx, block, i)
-		receipt, err := applyTransaction(msg, p.config, nil, gp, statedb, blockNumber, blockHash, tx, usedGas, vmenv)
+		// end pluGeth injection
+		receipt, err := applyTransaction(msg, p.config, gp, statedb, blockNumber, blockHash, tx, usedGas, vmenv)
 		if err != nil {
+			// begin PluGeth code injection 
 			pluginBlockProcessingError(tx, block, err)
 			blockTracer.BlockProcessingError(tx, block, err)
+			// end PluGeth code injection
 			return nil, nil, 0, fmt.Errorf("could not apply tx %d [%v]: %w", i, tx.Hash().Hex(), err)
 		}
+		// begin PluGeth code injection
 		pluginPostProcessTransaction(tx, block, i, receipt)
 		blockTracer.PostProcessTransaction(tx, block, i, receipt)
+		// end PluGeth code injection
 		receipts = append(receipts, receipt)
 		allLogs = append(allLogs, receipt.Logs...)
 	}
@@ -108,10 +119,11 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
 		return nil, nil, 0, fmt.Errorf("withdrawals before shanghai")
 	}
 	// Finalize the block, applying any consensus engine specific extras (e.g. block rewards)
-	p.engine.Finalize(p.bc, header, statedb, block.Transactions(), block.Uncles())
+	p.engine.Finalize(p.bc, header, statedb, block.Transactions(), block.Uncles(), withdrawals)
+	// begin PluGeth code injection
 	pluginPostProcessBlock(block)
 	blockTracer.PostProcessBlock(block)
-	//end PluGeth code injection
+	// end PluGeth code injection
 	return receipts, allLogs, *usedGas, nil
 }