add reward blob_fee, make baseFeePerGas compatibility mode show a 0 b…

…yte when set to 0

core/state_transition.go

@@ -555,7 +555,7 @@ func (st *stateTransition) execute() (*ExecutionResult, error) {
 			blobFee := new(big.Int).SetUint64(st.blobGasUsed())
 			blobFee.Mul(blobFee, st.evm.Context.BlobBaseFee)
 			blobFeeU256, _ := uint256.FromBig(blobFee)
-			st.state.AddBalance(consensus.SystemAddress, blobFeeU256, tracing.BalanceIncreaseRewardTransactionFee)
+			st.state.AddBalance(consensus.SystemAddress, blobFeeU256, tracing.BalanceIncreaseRewardBlobFee)
 		}
 	} else {
 		st.state.AddBalance(st.evm.Context.Coinbase, fee, tracing.BalanceIncreaseRewardTransactionFee)

core/tracing/hooks.go

@@ -329,6 +329,8 @@ const (
 	// BalanceIncreaseBSCDistributeReward is a balance change that increases the block validator's balance and
 	// happens when BSC is distributing rewards to validator.
 	BalanceIncreaseBSCDistributeReward BalanceChangeReason = 211
+	// BalanceIncreaseRewardBlobFee  was introduced in Tycho
+	BalanceIncreaseRewardBlobFee BalanceChangeReason = 212
 )
 
 // GasChangeReason is used to indicate the reason for a gas change, useful

eth/tracers/firehose.go

@@ -354,7 +354,7 @@ func (f *Firehose) OnBlockStart(event tracing.BlockEvent) {
 		Hash:   hash.Bytes(),
 		Number: block.NumberU64(),
 		// FIXME: Avoid calling 'Header()', it makes a copy while accessing event.Block getters directly avoids it
-		Header: newBlockHeaderFromChainHeader(hash, block.Header(), firehoseBigIntFromNative(new(big.Int).Add(event.TD, block.Difficulty()))),
+		Header: newBlockHeaderFromChainHeader(hash, block.Header(), firehoseBigIntFromNative(new(big.Int).Add(event.TD, block.Difficulty())), *f.applyBackwardCompatibility),
 		Ver:    4,
 
 		// FIXME: 'block.Size()' is a relatively heavy operation, could we do it async?
@@ -366,7 +366,7 @@ func (f *Firehose) OnBlockStart(event tracing.BlockEvent) {
 	}
 
 	for _, uncle := range block.Uncles() {
-		f.block.Uncles = append(f.block.Uncles, newBlockHeaderFromChainHeader(uncle.Hash(), uncle, nil))
+		f.block.Uncles = append(f.block.Uncles, newBlockHeaderFromChainHeader(uncle.Hash(), uncle, nil, *f.applyBackwardCompatibility))
 	}
 
 	if f.block.Header.BaseFeePerGas != nil {
@@ -1698,7 +1698,7 @@ func (f *Firehose) InternalTestingBuffer() *bytes.Buffer {
 }
 
 // FIXME: Create a unit test that is going to fail as soon as any header is added in
-func newBlockHeaderFromChainHeader(hash common.Hash, h *types.Header, td *pbeth.BigInt) *pbeth.BlockHeader {
+func newBlockHeaderFromChainHeader(hash common.Hash, h *types.Header, td *pbeth.BigInt, compatibilityMode bool) *pbeth.BlockHeader {
 	var withdrawalsHashBytes []byte
 	if hash := h.WithdrawalsHash; hash != nil {
 		withdrawalsHashBytes = hash.Bytes()
@@ -1743,6 +1743,10 @@ func newBlockHeaderFromChainHeader(hash common.Hash, h *types.Header, td *pbeth.
 		TxDependency: nil,
 	}
 
+	if compatibilityMode {
+		pbHead.BaseFeePerGas = firehoseBigIntFromNativeExplicitZero(h.BaseFee)
+	}
+
 	if pbHead.Difficulty == nil {
 		pbHead.Difficulty = &pbeth.BigInt{Bytes: []byte{0}}
 	}
@@ -1897,6 +1901,7 @@ var balanceChangeReasonToPb = map[tracing.BalanceChangeReason]pbeth.BalanceChang
 	tracing.BalanceIncreaseWithdrawal:           pbeth.BalanceChange_REASON_WITHDRAWAL,
 	tracing.BalanceDecreaseBSCDistributeReward:  pbeth.BalanceChange_REASON_REWARD_TRANSACTION_FEE,
 	tracing.BalanceIncreaseBSCDistributeReward:  pbeth.BalanceChange_REASON_REWARD_TRANSACTION_FEE,
+	tracing.BalanceIncreaseRewardBlobFee:        pbeth.BalanceChange_REASON_REWARD_BLOB_FEE,
 
 	tracing.BalanceChangeUnspecified: pbeth.BalanceChange_REASON_UNKNOWN,
 }
@@ -2267,6 +2272,18 @@ func firehoseBigIntFromNative(in *big.Int) *pbeth.BigInt {
 	return &pbeth.BigInt{Bytes: in.Bytes()}
 }
 
+// this version of firehoseBigIntFromNative will return a single byte with value 0 if the input is zero
+func firehoseBigIntFromNativeExplicitZero(in *big.Int) *pbeth.BigInt {
+	if in == nil {
+		return nil
+	}
+	if in.Sign() == 0 {
+		return &pbeth.BigInt{Bytes: []byte{0}}
+	}
+
+	return &pbeth.BigInt{Bytes: in.Bytes()}
+}
+
 type FinalityStatus struct {
 	LastIrreversibleBlockNumber uint64
 	LastIrreversibleBlockHash   []byte