Convert TransactionArgs to CIP-64/66 transaction

Closes #109
celo-org · May 15, 2024 · ee3ac51 · ee3ac51
1 parent 335ae9a
commit ee3ac51
Showing 1 changed file with 41 additions and 10 deletions.
diff --git a/internal/ethapi/transaction_args.go b/internal/ethapi/transaction_args.go
@@ -413,16 +413,47 @@ func (args *TransactionArgs) toTransaction() *types.Transaction {
 		if args.AccessList != nil {
 			al = *args.AccessList
 		}
-		data = &types.DynamicFeeTx{
-			To:         args.To,
-			ChainID:    (*big.Int)(args.ChainID),
-			Nonce:      uint64(*args.Nonce),
-			Gas:        uint64(*args.Gas),
-			GasFeeCap:  (*big.Int)(args.MaxFeePerGas),
-			GasTipCap:  (*big.Int)(args.MaxPriorityFeePerGas),
-			Value:      (*big.Int)(args.Value),
-			Data:       args.data(),
-			AccessList: al,
+		if args.FeeCurrency != nil {
+			if args.IsFeeCurrencyDenominated() {
+				data = &types.CeloDynamicFeeTx{
+					To:          args.To,
+					ChainID:     (*big.Int)(args.ChainID),
+					Nonce:       uint64(*args.Nonce),
+					Gas:         uint64(*args.Gas),
+					GasFeeCap:   (*big.Int)(args.MaxFeePerGas),
+					GasTipCap:   (*big.Int)(args.MaxPriorityFeePerGas),
+					Value:       (*big.Int)(args.Value),
+					Data:        args.data(),
+					AccessList:  al,
+					FeeCurrency: args.FeeCurrency,
+				}
+			} else {
+				data = &types.CeloDenominatedTx{
+					To:                  args.To,
+					ChainID:             (*big.Int)(args.ChainID),
+					Nonce:               uint64(*args.Nonce),
+					Gas:                 uint64(*args.Gas),
+					GasFeeCap:           (*big.Int)(args.MaxFeePerGas),
+					GasTipCap:           (*big.Int)(args.MaxPriorityFeePerGas),
+					Value:               (*big.Int)(args.Value),
+					Data:                args.data(),
+					AccessList:          al,
+					FeeCurrency:         args.FeeCurrency,
+					MaxFeeInFeeCurrency: (*big.Int)(args.MaxFeeInFeeCurrency),
+				}
+			}
+		} else {
+			data = &types.DynamicFeeTx{
+				To:         args.To,
+				ChainID:    (*big.Int)(args.ChainID),
+				Nonce:      uint64(*args.Nonce),
+				Gas:        uint64(*args.Gas),
+				GasFeeCap:  (*big.Int)(args.MaxFeePerGas),
+				GasTipCap:  (*big.Int)(args.MaxPriorityFeePerGas),
+				Value:      (*big.Int)(args.Value),
+				Data:       args.data(),
+				AccessList: al,
+			}
 		}
 	case args.AccessList != nil:
 		data = &types.AccessListTx{