After

celo-org · May 16, 2024 · 3c4513f · 3c4513f
1 parent 1efa14e
commit 3c4513f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/core/types/celo_dynamic_fee_tx.go b/core/types/celo_dynamic_fee_tx.go
@@ -23,18 +23,15 @@ import (
 )
 
 type CeloDynamicFeeTx struct {
-	ChainID             *big.Int
-	Nonce               uint64
-	GasTipCap           *big.Int
-	GasFeeCap           *big.Int
-	Gas                 uint64
-	FeeCurrency         *common.Address `rlp:"nil"` // nil means native currency
-	GatewayFeeRecipient *common.Address `rlp:"nil"` // nil means no gateway fee is paid
-	GatewayFee          *big.Int        `rlp:"nil"`
-	To                  *common.Address `rlp:"nil"` // nil means contract creation
-	Value               *big.Int
-	Data                []byte
-	AccessList          AccessList
+	ChainID    *big.Int
+	Nonce      uint64
+	GasTipCap  *big.Int
+	GasFeeCap  *big.Int
+	Gas        uint64
+	To         *common.Address `rlp:"nil"` // nil means contract creation
+	Value      *big.Int
+	Data       []byte
+	AccessList AccessList
 
 	// Signature values
 	V *big.Int `json:"v" gencodec:"required"`

diff --git a/core/types/pres_tx.go b/core/types/pres_tx.go
@@ -32,6 +32,10 @@ type LegacyTx struct {
 	Data     []byte          // contract invocation input data
 	V, R, S  *big.Int        // signature values
 
+	FeeCurrency         *common.Address // nil means native currency
+	GatewayFeeRecipient *common.Address // nil means no gateway fee is paid
+	GatewayFee          *big.Int
+
 	// This is only used when marshaling to JSON.
 	Hash *common.Hash `rlp:"-"`
 }
@@ -47,6 +51,10 @@ type CeloDynamicFeeTx struct {
 	Data       []byte
 	AccessList AccessList
 
+	FeeCurrency         *common.Address `rlp:"nil"` // nil means native currency
+	GatewayFeeRecipient *common.Address `rlp:"nil"` // nil means no gateway fee is paid
+	GatewayFee          *big.Int        `rlp:"nil"`
+
 	// Signature values
 	V *big.Int `json:"v" gencodec:"required"`
 	R *big.Int `json:"r" gencodec:"required"`
@@ -64,6 +72,8 @@ type CeloDynamicFeeTxV2 struct {
 	Data       []byte
 	AccessList AccessList
 
+	FeeCurrency *common.Address `rlp:"nil"` // nil means native currency
+
 	// Signature values
 	V *big.Int `json:"v" gencodec:"required"`
 	R *big.Int `json:"r" gencodec:"required"`