Merge pull request #48 from 0xPolygon/mardizzone/upstream-erigon-v3.2.1

Fetch upstream erigon v3.2.1

Author: marcello33

cl/beacon/handler/blobs.go

@@ -57,11 +57,6 @@ func (a *ApiHandler) GetEthV1BeaconBlobSidecars(w http.ResponseWriter, r *http.R
 		return nil, beaconhttp.NewEndpointError(http.StatusNotFound, errors.New("block not found"))
 	}
 
-	// reject after fulu fork
-	if a.beaconChainCfg.GetCurrentStateVersion(*slot/a.beaconChainCfg.SlotsPerEpoch) >= clparams.FuluVersion {
-		return nil, beaconhttp.NewEndpointError(http.StatusNotFound, errors.New("blobs are not supported after fulu fork"))
-	}
-
 	if a.caplinSnapshots != nil && *slot <= a.caplinSnapshots.FrozenBlobs() {
 		out, err := a.caplinSnapshots.ReadBlobSidecars(*slot)
 		if err != nil {

cl/clparams/config.go

@@ -675,13 +675,14 @@ type BeaconChainConfig struct {
 
 // GetBlobParameters returns the blob parameters at a given epoch
 func (b *BeaconChainConfig) GetBlobParameters(epoch uint64) BlobParameters {
-	// Iterate through schedule in desceding order
-	for i := range b.BlobSchedule {
+	// Iterate through schedule in desc order
+	for i := len(b.BlobSchedule) - 1; i >= 0; i-- {
 		entry := b.BlobSchedule[i]
 		if epoch >= entry.Epoch {
 			return entry
 		}
 	}
+
 	// Default to Electra parameters if no matching schedule entry
 	return BlobParameters{
 		Epoch:            b.ElectraForkEpoch,
@@ -729,9 +730,9 @@ func (b *BeaconChainConfig) GetCurrentStateVersion(epoch uint64) StateVersion {
 // InitializeForkSchedule initializes the schedules forks baked into the config.
 func (b *BeaconChainConfig) InitializeForkSchedule() {
 	b.ForkVersionSchedule = configForkSchedule(b)
-	// sort blob schedule by epoch in descending order
+	// sort blob schedule by epoch in ascending order
 	sort.Slice(b.BlobSchedule, func(i, j int) bool {
-		return b.BlobSchedule[i].Epoch > b.BlobSchedule[j].Epoch
+		return b.BlobSchedule[i].Epoch < b.BlobSchedule[j].Epoch
 	})
 }
 
@@ -1197,6 +1198,7 @@ func gnosisConfig() BeaconChainConfig {
 	cfg.MaxPerEpochActivationChurnLimit = 2
 	cfg.MaxPerEpochActivationExitChurnLimit = 64_000_000_000
 	cfg.MaxRequestBlobSidecarsElectra = 256
+	cfg.MaxPendingPartialsPerWithdrawalsSweep = 6
 	cfg.InitializeForkSchedule()
 	return cfg
 }

cl/cltypes/justification_bits.go

@@ -21,9 +21,12 @@ import (
 
 	"github.com/erigontech/erigon-lib/common/hexutil"
 	"github.com/erigontech/erigon-lib/types/clonable"
+	ssz2 "github.com/erigontech/erigon/cl/ssz"
 	"github.com/erigontech/erigon/cl/utils"
 )
 
+var _ ssz2.SizedObjectSSZ = (*JustificationBits)(nil)
+
 const JustificationBitsLength = 4
 
 type JustificationBits [JustificationBitsLength]bool // Bit vector of size 4

cl/cltypes/solid/checkpoint.go

@@ -25,6 +25,8 @@ import (
 	ssz2 "github.com/erigontech/erigon/cl/ssz"
 )
 
+var _ ssz2.SizedObjectSSZ = (*Checkpoint)(nil)
+
 const CheckpointSizeSSZ = 40
 
 type Checkpoint struct {

cl/persistence/state/epoch_data.go

@@ -111,6 +111,6 @@ func (m *EpochData) getSchema() []interface{} {
 		&m.FinalizedCheckpoint,
 		&m.HistoricalSummariesLength,
 		&m.HistoricalRootsLength,
-		&m.ProposerLookahead,
+		m.ProposerLookahead,
 	}
 }

core/blockchain.go

@@ -402,6 +402,13 @@ var alwaysSkipReceiptCheck = dbg.EnvBool("EXEC_SKIP_RECEIPT_CHECK", false)
 
 func BlockPostValidation(gasUsed, blobGasUsed uint64, checkReceipts bool, receipts types.Receipts, h *types.Header, isMining bool, txns types.Transactions, chainConfig *chain.Config, logger log.Logger) error {
 	if gasUsed != h.GasUsed {
+		var txgas string
+		sep := ""
+		for _, receipt := range receipts {
+			txgas += fmt.Sprintf("%s%d=%d", sep, receipt.TransactionIndex, receipt.GasUsed)
+			sep = ", "
+		}
+		logger.Warn("gas used mismatch", "block", h.Number.Uint64(), "header", h.GasUsed, "execution", gasUsed, "txgas", txgas)
 		return fmt.Errorf("gas used by execution: %d, in header: %d, headerNum=%d, %x",
 			gasUsed, h.GasUsed, h.Number.Uint64(), h.Hash())
 	}

core/state/cached_writer.go

@@ -44,10 +44,10 @@ func (cw *CachedWriter) UpdateAccountData(address common.Address, original, acco
 }
 
 func (cw *CachedWriter) UpdateAccountCode(address common.Address, incarnation uint64, codeHash common.Hash, code []byte) error {
-	if err := cw.w.UpdateAccountCode(address, incarnation, codeHash, code); err != nil {
+	if err := cw.w.UpdateAccountCode(address, 1, codeHash, code); err != nil {
 		return err
 	}
-	cw.cache.SetCodeWrite(address.Bytes(), incarnation, code)
+	cw.cache.SetCodeWrite(address.Bytes(), 1, code)
 	return nil
 }
 
@@ -60,16 +60,16 @@ func (cw *CachedWriter) DeleteAccount(address common.Address, original *accounts
 }
 
 func (cw *CachedWriter) WriteAccountStorage(address common.Address, incarnation uint64, key common.Hash, original, value uint256.Int) error {
-	if err := cw.w.WriteAccountStorage(address, incarnation, key, original, value); err != nil {
+	if err := cw.w.WriteAccountStorage(address, 1, key, original, value); err != nil {
 		return err
 	}
 	if original == value {
 		return nil
 	}
 	if value.IsZero() {
-		cw.cache.SetStorageDelete(address.Bytes(), incarnation, key[:])
+		cw.cache.SetStorageDelete(address.Bytes(), 1, key[:])
 	} else {
-		cw.cache.SetStorageWrite(address.Bytes(), incarnation, key[:], value.Bytes())
+		cw.cache.SetStorageWrite(address.Bytes(), 1, key[:], value.Bytes())
 	}
 	return nil
 }

core/state/intra_block_state.go

@@ -329,7 +329,12 @@ func (sdb *IntraBlockState) SubRefund(gas uint64) error {
 
 // Exist reports whether the given account address exists in the state.
 // Notably this also returns true for suicided accounts.
-func (sdb *IntraBlockState) Exist(addr common.Address) (bool, error) {
+func (sdb *IntraBlockState) Exist(addr common.Address) (exists bool, err error) {
+	if dbg.TraceTransactionIO && (sdb.trace || traceAccount(addr)) {
+		defer func() {
+			fmt.Printf("%d (%d.%d) Exists %x: %v (%s)\n", sdb.blockNum, sdb.txIndex, sdb.version, addr, exists, dbg.Stack())
+		}()
+	}
 	s, err := sdb.getStateObject(addr)
 	if err != nil {
 		return false, err
@@ -339,7 +344,12 @@ func (sdb *IntraBlockState) Exist(addr common.Address) (bool, error) {
 
 // Empty returns whether the state object is either non-existent
 // or empty according to the EIP161 specification (balance = nonce = code = 0)
-func (sdb *IntraBlockState) Empty(addr common.Address) (bool, error) {
+func (sdb *IntraBlockState) Empty(addr common.Address) (empty bool, err error) {
+	if dbg.TraceTransactionIO && (sdb.trace || traceAccount(addr)) {
+		defer func() {
+			fmt.Printf("%d (%d.%d) Empty %x: %v\n", sdb.blockNum, sdb.txIndex, sdb.version, addr, empty)
+		}()
+	}
 	so, err := sdb.getStateObject(addr)
 	if err != nil {
 		return false, err
@@ -1139,9 +1149,29 @@ func (sdb *IntraBlockState) createObject(addr common.Address, previous *stateObj
 //  2. tx_create(sha(account ++ nonce)) (note that this gets the address of 1)
 //
 // Carrying over the balance ensures that Ether doesn't disappear.
-func (sdb *IntraBlockState) CreateAccount(addr common.Address, contractCreation bool) error {
+func (sdb *IntraBlockState) CreateAccount(addr common.Address, contractCreation bool) (err error) {
 	var prevInc uint64
-	previous, err := sdb.getStateObject(addr)
+	var previous *stateObject
+
+	if dbg.TraceTransactionIO && (sdb.trace || traceAccount(addr)) {
+		defer func() {
+			var creatingContract string
+			if contractCreation {
+				creatingContract = " (contract)"
+			}
+			if err != nil {
+				fmt.Printf("%d (%d.%d) Create Account%s: %x, err=%s\n", sdb.blockNum, sdb.txIndex, sdb.version, creatingContract, addr, err)
+			} else {
+				var bal uint256.Int
+				if previous != nil {
+					bal = previous.data.Balance
+				}
+				fmt.Printf("%d (%d.%d) Create Account%s: %x, balance=%d\n", sdb.blockNum, sdb.txIndex, sdb.version, creatingContract, addr, &bal)
+			}
+		}()
+	}
+
+	previous, err = sdb.getStateObject(addr)
 	if err != nil {
 		return err
 	}
@@ -1233,7 +1263,7 @@ func (sdb *IntraBlockState) RevertToSnapshot(revid int, err error) {
 		}
 	}
 
-	if traced && sdb.txIndex == 8 && sdb.version == 1 {
+	if traced {
 		fmt.Printf("%d (%d.%d) Reverted: %d:%d\n", sdb.blockNum, sdb.txIndex, sdb.version, revid, snapshot)
 	}
 }

core/state_transition.go

@@ -601,7 +601,7 @@ func (st *StateTransition) TransitionDb(refunds bool, gasBailout bool) (result *
 		}
 	}
 
-	if st.state.Trace() || st.state.TraceAccount(st.msg.From()) {
+	if dbg.TraceGas || st.state.Trace() || st.state.TraceAccount(st.msg.From()) {
 		fmt.Printf("(%d.%d) Fees %x: tipped: %d, burnt: %d, price: %d, gas: %d\n", st.state.TxIndex(), st.state.Incarnation(), st.msg.From(), tipAmount, &burnAmount, st.gasPrice, st.gasUsed())
 	}
 
@@ -718,7 +718,7 @@ func (st *StateTransition) verifyAuthorities(auths []types.Authorization, contra
 func (st *StateTransition) refundGas() {
 	// Return ETH for remaining gas, exchanged at the original rate.
 	remaining := new(uint256.Int).Mul(new(uint256.Int).SetUint64(st.gasRemaining), st.gasPrice)
-	if st.state.Trace() || st.state.TraceAccount(st.msg.From()) {
+	if dbg.TraceGas || st.state.Trace() || st.state.TraceAccount(st.msg.From()) {
 		fmt.Printf("(%d.%d) Refund %x: remaining: %d, price: %d val: %d\n", st.state.TxIndex(), st.state.Incarnation(), st.msg.From(), st.gasRemaining, st.gasPrice, remaining)
 	}
 

core/vm/interpreter.go

@@ -264,12 +264,14 @@ func (in *EVMInterpreter) Run(contract *Contract, input []byte, readOnly bool) (
 		pc   = &_pc      // program counter
 		cost uint64
 		// copies used by tracer
-		pcCopy  uint64 // needed for the deferred Tracer
-		gasCopy uint64 // for Tracer to log gas remaining before execution
-		logged  bool   // deferred Tracer should ignore already logged steps
-		res     []byte // result of the opcode execution function
-		debug   = in.cfg.Tracer != nil && (in.cfg.Tracer.OnOpcode != nil || in.cfg.Tracer.OnGasChange != nil || in.cfg.Tracer.OnFault != nil)
-		trace   = dbg.TraceInstructions && in.evm.intraBlockState.Trace()
+		pcCopy                 uint64 // needed for the deferred Tracer
+		gasCopy                uint64 // for Tracer to log gas remaining before execution
+		callGas                uint64
+		logged                 bool   // deferred Tracer should ignore already logged steps
+		res                    []byte // result of the opcode execution function
+		debug                  = in.cfg.Tracer != nil && (in.cfg.Tracer.OnOpcode != nil || in.cfg.Tracer.OnGasChange != nil || in.cfg.Tracer.OnFault != nil)
+		trace                  = dbg.TraceInstructions && in.evm.intraBlockState.Trace()
+		txIndex, txIncarnation int
 	)
 
 	contract.Input = input
@@ -307,14 +309,24 @@ func (in *EVMInterpreter) Run(contract *Contract, input []byte, readOnly bool) (
 	// parent context.
 	steps := 0
 
+	var traceGas = func(op OpCode, callGas, cost uint64) uint64 {
+		switch op {
+		case CALL, CALLCODE, DELEGATECALL, STATICCALL:
+			return callGas
+		default:
+			return cost
+		}
+	}
+
 	for {
 		steps++
 		if steps%5000 == 0 && in.evm.Cancelled() {
 			break
 		}
-		if debug {
+		if dbg.TraceDyanmicGas || debug || trace {
 			// Capture pre-execution values for tracing.
 			logged, pcCopy, gasCopy = false, _pc, contract.Gas
+			txIndex, txIncarnation = in.evm.intraBlockState.TxIndex(), in.evm.intraBlockState.Incarnation()
 		}
 		// Get the operation from the jump table and validate the stack to ensure there are
 		// enough stack items available to perform the operation.
@@ -354,9 +366,13 @@ func (in *EVMInterpreter) Run(contract *Contract, input []byte, readOnly bool) (
 			var dynamicCost uint64
 			dynamicCost, err = operation.dynamicGas(in.evm, contract, locStack, mem, memorySize)
 			cost += dynamicCost // for tracing
+			callGas = operation.constantGas + dynamicCost - in.evm.CallGasTemp()
 			if err != nil {
 				return nil, fmt.Errorf("%w: %v", ErrOutOfGas, err)
 			}
+			if dbg.TraceDyanmicGas && dynamicCost > 0 {
+				fmt.Printf("(%d.%d) Dynamic Gas: %d (%s)\n", txIndex, txIncarnation, traceGas(op, callGas, cost), op)
+			}
 			if !contract.UseGas(dynamicCost, in.cfg.Tracer, tracing.GasChangeIgnored) {
 				return nil, ErrOutOfGas
 			}