fix(cannon): Calculate gasPrice for type 2/3 transactions seperately (#…

…440)

* fix(cannon): Calculate gasPrice for type 2/3 transactions seperately

* fix(cannon): Calculate gasPrice for type 2/3 transactions seperately

pkg/cannon/deriver/beacon/eth/v2/execution_transaction.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/hex"
 	"fmt"
+	"math/big"
 	"strconv"
 	"time"
 
@@ -279,7 +280,11 @@ func (b *ExecutionTransactionDeriver) processSlot(ctx context.Context, slot phas
 			return nil, fmt.Errorf("failed to get transaction sender: %v", err)
 		}
 
-		gasPrice := transaction.GasPrice()
+		gasPrice, err := GetGasPrice(block, transaction)
+		if err != nil {
+			return nil, fmt.Errorf("failed to get transaction gas price: %v", err)
+		}
+
 		if gasPrice == nil {
 			return nil, fmt.Errorf("failed to get transaction gas price")
 		}
@@ -303,7 +308,7 @@ func (b *ExecutionTransactionDeriver) processSlot(ctx context.Context, slot phas
 		tx := &xatuethv1.Transaction{
 			Nonce:     wrapperspb.UInt64(transaction.Nonce()),
 			Gas:       wrapperspb.UInt64(transaction.Gas()),
-			GasPrice:  transaction.GasPrice().String(),
+			GasPrice:  gasPrice.String(),
 			GasTipCap: transaction.GasTipCap().String(),
 			GasFeeCap: transaction.GasFeeCap().String(),
 			To:        to,
@@ -410,3 +415,36 @@ func (b *ExecutionTransactionDeriver) createEvent(ctx context.Context, transacti
 
 	return decoratedEvent, nil
 }
+
+func GetGasPrice(block *spec.VersionedSignedBeaconBlock, transaction *types.Transaction) (*big.Int, error) {
+	if transaction.Type() == 0 || transaction.Type() == 1 {
+		return transaction.GasPrice(), nil
+	}
+
+	if transaction.Type() == 2 || transaction.Type() == 3 { // EIP-1559 or Blob transactions
+		baseFee := new(big.Int)
+
+		switch block.Version {
+		case spec.DataVersionBellatrix:
+			baseFee = new(big.Int).SetBytes(block.Bellatrix.Message.Body.ExecutionPayload.BaseFeePerGas[:])
+		case spec.DataVersionDeneb:
+			executionPayload := block.Deneb.Message.Body.ExecutionPayload
+			baseFee.SetBytes(executionPayload.BaseFeePerGas.Bytes())
+		case spec.DataVersionElectra:
+			executionPayload := block.Electra.Message.Body.ExecutionPayload
+			baseFee.SetBytes(executionPayload.BaseFeePerGas.Bytes())
+		default:
+			return nil, fmt.Errorf("unknown block version: %d", block.Version)
+		}
+
+		// Calculate Effective Gas Price: min(max_fee_per_gas, base_fee + max_priority_fee_per_gas)
+		gasPrice := new(big.Int).Add(baseFee, transaction.GasTipCap())
+		if gasPrice.Cmp(transaction.GasFeeCap()) > 0 {
+			gasPrice = transaction.GasFeeCap()
+		}
+
+		return gasPrice, nil
+	}
+
+	return nil, fmt.Errorf("unknown transaction type: %d", transaction.Type())
+}