Add MaxFeePerDataGas to transaction JSON

Author: Inphi

core/types/transaction_marshalling.go

@@ -50,6 +50,7 @@ type txJSON struct {
 	AccessList *AccessList  `json:"accessList,omitempty"`
 
 	// Blob transaction fields:
+	MaxFeePerDataGas    *hexutil.Big  `json:"maxFeePerDataGas,omitempty"`
 	BlobVersionedHashes []common.Hash `json:"blobVersionedHashes,omitempty"`
 	Blobs               Blobs         `json:"blobs,omitempty"`
 	BlobKzgs            BlobKzgs      `json:"blobKzgs,omitempty"`
@@ -117,6 +118,7 @@ func (t *Transaction) MarshalJSON() ([]byte, error) {
 		enc.V = (*hexutil.Big)(v)
 		enc.R = (*hexutil.Big)(r)
 		enc.S = (*hexutil.Big)(s)
+		enc.MaxFeePerDataGas = (*hexutil.Big)(u256ToBig(&tx.Message.MaxFeePerDataGas))
 		enc.BlobVersionedHashes = tx.Message.BlobVersionedHashes
 		if t.wrapData != nil {
 			enc.Blobs = t.wrapData.blobs()
@@ -347,6 +349,10 @@ func (t *Transaction) UnmarshalJSON(input []byte) error {
 				return err
 			}
 		}
+		itx.Message.MaxFeePerDataGas.SetFromBig((*big.Int)(dec.MaxFeePerDataGas))
+		if dec.MaxFeePerDataGas == nil {
+			return errors.New("missing required field 'maxFeePerDataGas' for txdata")
+		}
 		itx.Message.BlobVersionedHashes = dec.BlobVersionedHashes
 		// A BlobTx may not contain data
 		if len(dec.Blobs) != 0 || len(dec.BlobKzgs) != 0 {

core/types/transaction_test.go

@@ -544,6 +544,7 @@ func TestBlobTransactionMinimalCodec(t *testing.T) {
 			GasFeeCap:           view.Uint256View(*uint256.NewInt(10)),
 			AccessList:          AccessListView(accesses),
 			BlobVersionedHashes: VersionedHashesView{common.HexToHash("0x01624652859a6e98ffc1608e2af0147ca4e86e1ce27672d8d3f3c9d4ffd6ef7e")},
+			MaxFeePerDataGas:    view.Uint256View(*uint256.NewInt(10000000)),
 		},
 	}
 	tx, err := SignNewTx(key, signer, txdata)