merge fixes

Author: dhyaniarun1993

core/state/intra_block_state.go

@@ -641,8 +641,8 @@ func (sdb *IntraBlockState) createObject(addr libcommon.Address, previous *state
 		sdb.journal.append(resetObjectChange{account: &addr, prev: previous})
 	}
 
-	if sdb.logger != nil && sdb.logger.OnNewAccount != nil {
-		sdb.logger.OnNewAccount(addr, previous != nil)
+	if sdb.tracingHooks != nil && sdb.tracingHooks.OnNewAccount != nil {
+		sdb.tracingHooks.OnNewAccount(addr, previous != nil)
 	}
 
 	newobj.newlyCreated = true

eth/tracers/internal/tracetest/firehose/blockchain_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/erigontech/erigon-lib/common"
+	"github.com/erigontech/erigon-lib/common/datadir"
 	"github.com/erigontech/erigon-lib/log/v3"
 	"github.com/erigontech/erigon/core"
 	"github.com/erigontech/erigon/core/state"
@@ -34,10 +35,10 @@ func runPrestateBlock(t *testing.T, prestatePath string, hooks *tracing.Hooks) {
 	dbTx, err := m.DB.BeginRw(m.Ctx)
 	require.NoError(t, err)
 	defer dbTx.Rollback()
-	stateDB, _ := tests.MakePreState(rules, dbTx, prestate.Genesis.Alloc, uint64(context.BlockNumber), m.HistoryV3)
+	stateDB, _ := tests.MakePreState(rules, dbTx, prestate.Genesis.Alloc, context.BlockNumber)
 
 	var logger = log.New("test")
-	genesisBlock, _, err := core.GenesisToBlock(prestate.Genesis, "", logger, nil)
+	genesisBlock, _, err := core.GenesisToBlock(prestate.Genesis, datadir.New(""), logger)
 	require.NoError(t, err)
 
 	block := types.NewBlock(&types.Header{
@@ -49,10 +50,10 @@ func runPrestateBlock(t *testing.T, prestatePath string, hooks *tracing.Hooks) {
 		GasLimit:              context.GasLimit,
 		BaseFee:               context.BaseFee.ToBig(),
 		ParentBeaconBlockRoot: ptr(common.Hash{}),
-	}, []types.Transaction{tx}, nil, nil, nil, nil)
+	}, []types.Transaction{tx}, nil, nil, nil)
 
-	stateDB.SetLogger(hooks)
-	stateDB.SetTxContext(tx.Hash(), block.Hash(), 0)
+	stateDB.SetHooks(hooks)
+	stateDB.SetTxContext(0)
 
 	hooks.OnBlockchainInit(prestate.Genesis.Config)
 	hooks.OnBlockStart(tracing.BlockEvent{

eth/tracers/internal/tracetest/firehose/prestate_test.go

@@ -7,8 +7,9 @@ import (
 	"testing"
 
 	"github.com/erigontech/erigon-lib/common"
+	"github.com/erigontech/erigon-lib/common/datadir"
+	"github.com/erigontech/erigon-lib/common/math"
 	"github.com/erigontech/erigon-lib/log/v3"
-	"github.com/erigontech/erigon/common/math"
 	"github.com/erigontech/erigon/consensus"
 	"github.com/erigontech/erigon/consensus/ethash"
 	"github.com/erigontech/erigon/core"
@@ -66,7 +67,7 @@ func (p *prestateData) GetHeader(hash common.Hash, number uint64) (*types.Header
 	}
 
 	if p.genesisBlock == nil {
-		p.genesisBlock, _, err = core.GenesisToBlock(p.Genesis, "", logger, nil)
+		p.genesisBlock, _, err = core.GenesisToBlock(p.Genesis, datadir.New(""), logger)
 		if err != nil {
 			return nil, err
 		}

eth/tracers/live/firehose.go

@@ -22,15 +22,13 @@ import (
 
 	"github.com/erigontech/erigon-lib/chain"
 	libcommon "github.com/erigontech/erigon-lib/common"
+	"github.com/erigontech/erigon-lib/common/math"
+	"github.com/erigontech/erigon-lib/crypto"
 	"github.com/erigontech/erigon-lib/log/v3"
-	types2 "github.com/erigontech/erigon-lib/types"
-
 	"github.com/erigontech/erigon/common"
-	"github.com/erigontech/erigon/common/math"
 	"github.com/erigontech/erigon/core/tracing"
 	"github.com/erigontech/erigon/core/types"
 	"github.com/erigontech/erigon/core/vm"
-	"github.com/erigontech/erigon/crypto"
 	"github.com/erigontech/erigon/eth/tracers"
 	"github.com/erigontech/erigon/params"
 	pbeth "github.com/erigontech/erigon/pb/sf/ethereum/type/v2"
@@ -1435,7 +1433,7 @@ func (f *Firehose) panicInvalidState(msg string, callerSkip int) string {
 	}
 
 	if f.transaction != nil {
-		msg += fmt.Sprintf(" in transaction %s", hex.EncodeToString(f.transaction.Hash))
+		msg += " in transaction " + hex.EncodeToString(f.transaction.Hash)
 	}
 
 	panic(fmt.Errorf("%s (caller=%s, init=%t, inBlock=%t, inTransaction=%t, inCall=%t)", msg, caller, f.chainConfig != nil, f.block != nil, f.transaction != nil, f.callStack.HasActiveCall()))
@@ -1681,7 +1679,7 @@ func newTxReceiptFromChain(receipt *types.Receipt, txType pbeth.TransactionTrace
 	return out
 }
 
-func newAccessListFromChain(accessList types2.AccessList) (out []*pbeth.AccessTuple) {
+func newAccessListFromChain(accessList types.AccessList) (out []*pbeth.AccessTuple) {
 	if len(accessList) == 0 {
 		return nil
 	}
@@ -1927,7 +1925,7 @@ func (s *CallStack) NextIndex() uint32 {
 
 func (s *CallStack) Pop() (out *pbeth.Call) {
 	if len(s.stack) == 0 {
-		panic(fmt.Errorf("pop from empty call stack"))
+		panic(errors.New("pop from empty call stack"))
 	}
 
 	out = s.stack[len(s.stack)-1]
@@ -2180,7 +2178,7 @@ func validateFirehoseKnownTransactionType(txType byte, isKnownFirehoseTxType boo
 	if err != nil {
 		if err == types.ErrTxTypeNotSupported {
 			if isKnownFirehoseTxType {
-				return fmt.Errorf("firehose known type but encoding RLP of receipt led to 'types.ErrTxTypeNotSupported'")
+				return errors.New("firehose known type but encoding RLP of receipt led to 'types.ErrTxTypeNotSupported'")
 			}
 
 			// It's not a known type and encoding reported the same, so validation is OK
@@ -2197,7 +2195,7 @@ func validateFirehoseKnownTransactionType(txType byte, isKnownFirehoseTxType boo
 	if err != nil {
 		if err == types.ErrTxTypeNotSupported {
 			if isKnownFirehoseTxType {
-				return fmt.Errorf("firehose known type but decoding of RLP of receipt led to 'types.ErrTxTypeNotSupported'")
+				return errors.New("firehose known type but decoding of RLP of receipt led to 'types.ErrTxTypeNotSupported'")
 			}
 
 			// It's not a known type and decoding reported the same, so validation is OK
@@ -2235,7 +2233,7 @@ func validateAddressField(into *validationResult, field string, a, b libcommon.A
 }
 
 func validateBigIntField(into *validationResult, field string, a, b *big.Int) {
-	equal := false
+	var equal bool
 	if a == nil && b == nil {
 		equal = true
 	} else if a == nil || b == nil {

eth/tracers/live/firehose_test.go

@@ -448,7 +448,7 @@ func blockEvent(height uint64) tracing.BlockEvent {
 	return tracing.BlockEvent{
 		Block: types.NewBlock(&types.Header{
 			Number: b(int64(height)),
-		}, nil, nil, nil, nil, nil),
+		}, nil, nil, nil, nil),
 		TD: b(1),
 	}
 }