CIP-64 / CIP-66 compatible TransactionArgs

core/state_transition.go

@@ -154,14 +154,15 @@ func toWordSize(size uint64) uint64 {
 // A Message contains the data derived from a single transaction that is relevant to state
 // processing.
 type Message struct {
-	To            *common.Address
-	From          common.Address
-	Nonce         uint64
-	Value         *big.Int
-	GasLimit      uint64
-	GasPrice      *big.Int
-	GasFeeCap     *big.Int
-	GasTipCap     *big.Int
+	To        *common.Address
+	From      common.Address
+	Nonce     uint64
+	Value     *big.Int
+	GasLimit  uint64
+	GasPrice  *big.Int
+	GasFeeCap *big.Int
+	GasTipCap *big.Int
+
 	Data          []byte
 	AccessList    types.AccessList
 	BlobGasFeeCap *big.Int
@@ -182,8 +183,7 @@ type Message struct {
 	// FeeCurrency specifies the currency for gas fees.
 	// `nil` corresponds to Celo Gold (native currency).
 	// All other values should correspond to ERC20 contract addresses.
-	FeeCurrency *common.Address
-
+	FeeCurrency         *common.Address
 	MaxFeeInFeeCurrency *big.Int // MaxFeeInFeeCurrency is the maximum fee that can be charged in the fee currency.
 }
 
@@ -213,7 +213,7 @@ func TransactionToMessage(tx *types.Transaction, s types.Signer, baseFee *big.In
 	}
 	// If baseFee provided, set gasPrice to effectiveGasPrice.
 	if baseFee != nil {
-		if msg.FeeCurrency != nil {
+		if tx.Type() == types.CeloDynamicFeeTxType {
 			var err error
 			baseFee, err = exchange.ConvertGoldToCurrency(exchangeRates, msg.FeeCurrency, baseFee)
 			if err != nil {

internal/ethapi/transaction_args.go

@@ -445,10 +445,11 @@ func (args *TransactionArgs) ToMessage(globalGasCap uint64, baseFee *big.Int, ex
 		gas = globalGasCap
 	}
 	var (
-		gasPrice   *big.Int
-		gasFeeCap  *big.Int
-		gasTipCap  *big.Int
-		blobFeeCap *big.Int
+		gasPrice            *big.Int
+		gasFeeCap           *big.Int
+		gasTipCap           *big.Int
+		blobFeeCap          *big.Int
+		maxFeeInFeeCurrency *big.Int
 	)
 	if baseFee == nil {
 		// If there's no basefee, then it must be a non-1559 execution
@@ -501,20 +502,24 @@ func (args *TransactionArgs) ToMessage(globalGasCap uint64, baseFee *big.Int, ex
 	if args.AccessList != nil {
 		accessList = *args.AccessList
 	}
+	if args.MaxFeeInFeeCurrency != nil {
+		maxFeeInFeeCurrency = args.MaxFeeInFeeCurrency.ToInt()
+	}
 	msg := &core.Message{
-		From:              addr,
-		To:                args.To,
-		Value:             value,
-		GasLimit:          gas,
-		GasPrice:          gasPrice,
-		GasFeeCap:         gasFeeCap,
-		GasTipCap:         gasTipCap,
-		Data:              data,
-		AccessList:        accessList,
-		BlobGasFeeCap:     blobFeeCap,
-		BlobHashes:        args.BlobHashes,
-		SkipAccountChecks: true,
-		FeeCurrency:       args.FeeCurrency,
+		From:                addr,
+		To:                  args.To,
+		Value:               value,
+		GasLimit:            gas,
+		GasPrice:            gasPrice,
+		GasFeeCap:           gasFeeCap,
+		GasTipCap:           gasTipCap,
+		Data:                data,
+		AccessList:          accessList,
+		BlobGasFeeCap:       blobFeeCap,
+		BlobHashes:          args.BlobHashes,
+		SkipAccountChecks:   true,
+		FeeCurrency:         args.FeeCurrency,
+		MaxFeeInFeeCurrency: maxFeeInFeeCurrency,
 	}
 	return msg, nil
 }