Fix DAFootprint calculation in block header

Author: mininny

consensus/merge/merge.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+	"github.com/erigontech/erigon-lib/opstack"
 	"math/big"
 
 	"github.com/holiman/uint256"
@@ -189,6 +190,17 @@ func (s *Merge) Finalize(config *chain.Config, header *types.Header, state *stat
 		}
 	}
 
+	// Store DA footprint in BlobGasUsed header field if it hasn't already been set yet.
+	// Builder code may already calculate it during block building to avoid recalculating it here.
+	if config.IsJovian(header.Time) && (header.BlobGasUsed == nil || *header.BlobGasUsed == 0) {
+		daFootprint, err := CalcDAFootprint(txs)
+		if err != nil {
+			return nil, nil, nil, fmt.Errorf("error calculating DA footprint: %w", err)
+		}
+		log.Info("DA Footprint: ", "val", daFootprint)
+		header.BlobGasUsed = &daFootprint
+	}
+
 	return txs, receipts, rs, nil
 }
 
@@ -373,3 +385,37 @@ func IsTTDReached(chain consensus.ChainHeaderReader, parentHash libcommon.Hash,
 	}
 	return td.Cmp(chain.Config().TerminalTotalDifficulty) >= 0, nil
 }
+
+// CalcDAFootprint calculates the total DA footprint of a block for an OP Stack chain.
+// Jovian introduces a DA footprint block limit which is stored in the BlobGasUsed header field and that is taken
+// into account during base fee updates.
+// CalcDAFootprint must not be called for pre-Jovian blocks.
+func CalcDAFootprint(txs types.Transactions) (uint64, error) {
+	if txs.Len() == 0 || txs[0].Type() != types.DepositTxType {
+		return 0, fmt.Errorf("missing deposit transaction")
+	}
+
+	// First Jovian block doesn't set the DA footprint gas scalar yet and
+	// it must not have user transactions.
+	data := txs[0].GetData()
+	if len(data) == opstack.IsthmusL1AttributesLen {
+		if txs[len(txs)-1].Type() != types.DepositTxType {
+			// sufficient to check last transaction because deposits precede non-deposit txs
+			return 0, fmt.Errorf("unexpected non-deposit transactions in Jovian activation block")
+		}
+		return 0, nil
+	} // ExtractDAFootprintGasScalar catches all invalid lengths
+
+	daFootprintGasScalar, err := opstack.ExtractDAFootprintGasScalar(data)
+	if err != nil {
+		return 0, err
+	}
+	var daFootprint uint64
+	for _, tx := range txs {
+		if tx.Type() == types.DepositTxType {
+			continue
+		}
+		daFootprint += tx.RollupCostData().EstimatedDASize().Uint64() * uint64(daFootprintGasScalar)
+	}
+	return daFootprint, nil
+}

core/blockchain.go

@@ -153,7 +153,7 @@ func ExecuteBlockEphemerally(
 		return nil, fmt.Errorf("gas used by execution: %d, in header: %d", *usedGas, header.GasUsed)
 	}
 
-	if header.BlobGasUsed != nil && *usedBlobGas != *header.BlobGasUsed {
+	if !chainConfig.IsOptimism() && header.BlobGasUsed != nil && *usedBlobGas != *header.BlobGasUsed {
 		return nil, fmt.Errorf("blob gas used by execution: %d, in header: %d", *usedBlobGas, *header.BlobGasUsed)
 	}
 

eth/stagedsync/stage_mining_exec.go

@@ -509,7 +509,7 @@ LOOP:
 		var txDAFootprint uint64
 		// Note that commitTransaction is only called after deposit transactions have already been committed,
 		// so we don't need to resolve the transaction here and exclude deposits.
-		if isJovian {
+		if isJovian && txn.Type() != types.DepositTxType {
 			txDAFootprint = txn.RollupCostData().EstimatedDASize().Uint64() * uint64(current.daFootprintGasScalar)
 			if daFootprintLeft < txDAFootprint {
 				log.Debug("Not enough DA space left for transaction", "hash", txn.Hash(), "left", daFootprintLeft, "needed", txDAFootprint)

eth/stagedsync/stage_mining_finish.go

@@ -6,7 +6,6 @@ import (
 	"github.com/erigontech/erigon-lib/chain"
 	"github.com/erigontech/erigon-lib/kv"
 	"github.com/erigontech/erigon-lib/log/v3"
-	"github.com/erigontech/erigon-lib/opstack"
 	"github.com/erigontech/erigon/consensus"
 	"github.com/erigontech/erigon/core/types"
 	"github.com/erigontech/erigon/turbo/builder"
@@ -52,17 +51,6 @@ func SpawnMiningFinishStage(s *StageState, tx kv.RwTx, cfg MiningFinishCfg, quit
 	//	continue
 	//}
 
-	// Store DA footprint in BlobGasUsed header field if it hasn't already been set yet.
-	// Builder code may already calculate it during block building to avoid recalculating it here.
-	header := current.Header
-	if cfg.chainConfig.IsJovian(header.Time) && (header.BlobGasUsed == nil || *header.BlobGasUsed == 0) {
-		daFootprint, err := CalcDAFootprint(current.Txs)
-		if err != nil {
-			return fmt.Errorf("error calculating DA footprint: %w", err)
-		}
-		header.BlobGasUsed = &daFootprint
-	}
-
 	block := types.NewBlockForAsembling(current.Header, current.Txs, current.Uncles, current.Receipts, current.Withdrawals, cfg.chainConfig.IsOptimismIsthmus(current.Header.Time))
 	blockWithReceipts := &types.BlockWithReceipts{Block: block, Receipts: current.Receipts, Requests: current.Requests}
 	*current = MiningBlock{} // hack to clean global data
@@ -109,37 +97,3 @@ func SpawnMiningFinishStage(s *StageState, tx kv.RwTx, cfg MiningFinishCfg, quit
 
 	return nil
 }
-
-// CalcDAFootprint calculates the total DA footprint of a block for an OP Stack chain.
-// Jovian introduces a DA footprint block limit which is stored in the BlobGasUsed header field and that is taken
-// into account during base fee updates.
-// CalcDAFootprint must not be called for pre-Jovian blocks.
-func CalcDAFootprint(txs types.Transactions) (uint64, error) {
-	if txs.Len() == 0 || txs[0].Type() != types.DepositTxType {
-		return 0, fmt.Errorf("missing deposit transaction")
-	}
-
-	// First Jovian block doesn't set the DA footprint gas scalar yet and
-	// it must not have user transactions.
-	data := txs[0].GetData()
-	if len(data) == opstack.IsthmusL1AttributesLen {
-		if txs[len(txs)-1].Type() != types.DepositTxType {
-			// sufficient to check last transaction because deposits precede non-deposit txs
-			return 0, fmt.Errorf("unexpected non-deposit transactions in Jovian activation block")
-		}
-		return 0, nil
-	} // ExtractDAFootprintGasScalar catches all invalid lengths
-
-	daFootprintGasScalar, err := opstack.ExtractDAFootprintGasScalar(data)
-	if err != nil {
-		return 0, err
-	}
-	var daFootprint uint64
-	for _, tx := range txs {
-		if tx.Type() == types.DepositTxType {
-			continue
-		}
-		daFootprint += tx.RollupCostData().EstimatedDASize().Uint64() * uint64(daFootprintGasScalar)
-	}
-	return daFootprint, nil
-}

turbo/engineapi/engine_server.go

@@ -140,7 +140,7 @@ func (s *EngineServer) newPayload(ctx context.Context, req *engine_types.Executi
 ) (*engine_types.PayloadStatus, error) {
 	var bloom types.Bloom
 	copy(bloom[:], req.LogsBloom)
-
+	log.Info("HEader", "blobGasUsed", req.BlobGasUsed)
 	txs := [][]byte{}
 	for _, transaction := range req.Transactions {
 		txs = append(txs, transaction)