From a9d7cdaf6ecb7c19cd3052e5501a311237be27f8 Mon Sep 17 00:00:00 2001
From: ucwong <ucwong@126.com>
Date: Tue, 2 May 2023 02:32:27 -0600
Subject: [PATCH] core/types:  go generate (#27196)

Fixes a discrepancy between source and generated files, which was introduced when ExcessDataGas was added in https://github.com/ethereum/go-ethereum/pull/27046.
---
 core/types/gen_header_json.go |  6 ++++++
 core/types/gen_header_rlp.go  | 15 +++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go
index 5c8b81652..73287257b 100644
--- a/core/types/gen_header_json.go
+++ b/core/types/gen_header_json.go
@@ -33,6 +33,7 @@ func (h Header) MarshalJSON() ([]byte, error) {
 		Nonce           BlockNonce     `json:"nonce"`
 		BaseFee         *hexutil.Big   `json:"baseFeePerGas" rlp:"optional"`
 		WithdrawalsHash *common.Hash   `json:"withdrawalsRoot" rlp:"optional"`
+		ExcessDataGas   *big.Int       `json:"excessDataGas" rlp:"optional"`
 		Hash            common.Hash    `json:"hash"`
 	}
 	var enc Header
@@ -53,6 +54,7 @@ func (h Header) MarshalJSON() ([]byte, error) {
 	enc.Nonce = h.Nonce
 	enc.BaseFee = (*hexutil.Big)(h.BaseFee)
 	enc.WithdrawalsHash = h.WithdrawalsHash
+	enc.ExcessDataGas = h.ExcessDataGas
 	enc.Hash = h.Hash()
 	return json.Marshal(&enc)
 }
@@ -77,6 +79,7 @@ func (h *Header) UnmarshalJSON(input []byte) error {
 		Nonce           *BlockNonce     `json:"nonce"`
 		BaseFee         *hexutil.Big    `json:"baseFeePerGas" rlp:"optional"`
 		WithdrawalsHash *common.Hash    `json:"withdrawalsRoot" rlp:"optional"`
+		ExcessDataGas   *big.Int        `json:"excessDataGas" rlp:"optional"`
 	}
 	var dec Header
 	if err := json.Unmarshal(input, &dec); err != nil {
@@ -145,5 +148,8 @@ func (h *Header) UnmarshalJSON(input []byte) error {
 	if dec.WithdrawalsHash != nil {
 		h.WithdrawalsHash = dec.WithdrawalsHash
 	}
+	if dec.ExcessDataGas != nil {
+		h.ExcessDataGas = dec.ExcessDataGas
+	}
 	return nil
 }
diff --git a/core/types/gen_header_rlp.go b/core/types/gen_header_rlp.go
index 7fd2cf8f2..005f6c2ad 100644
--- a/core/types/gen_header_rlp.go
+++ b/core/types/gen_header_rlp.go
@@ -42,7 +42,8 @@ func (obj *Header) EncodeRLP(_w io.Writer) error {
 	w.WriteBytes(obj.Nonce[:])
 	_tmp1 := obj.BaseFee != nil
 	_tmp2 := obj.WithdrawalsHash != nil
-	if _tmp1 || _tmp2 {
+	_tmp3 := obj.ExcessDataGas != nil
+	if _tmp1 || _tmp2 || _tmp3 {
 		if obj.BaseFee == nil {
 			w.Write(rlp.EmptyString)
 		} else {
@@ -52,13 +53,23 @@ func (obj *Header) EncodeRLP(_w io.Writer) error {
 			w.WriteBigInt(obj.BaseFee)
 		}
 	}
-	if _tmp2 {
+	if _tmp2 || _tmp3 {
 		if obj.WithdrawalsHash == nil {
 			w.Write([]byte{0x80})
 		} else {
 			w.WriteBytes(obj.WithdrawalsHash[:])
 		}
 	}
+	if _tmp3 {
+		if obj.ExcessDataGas == nil {
+			w.Write(rlp.EmptyString)
+		} else {
+			if obj.ExcessDataGas.Sign() == -1 {
+				return rlp.ErrNegativeBigInt
+			}
+			w.WriteBigInt(obj.ExcessDataGas)
+		}
+	}
 	w.ListEnd(_tmp0)
 	return w.Flush()
 }