Revert "core/types: put header fields in correct order (ethereum#27791)"

This reverts commit 23f7874.
HorizenOfficial · Nov 10, 2023 · 81f9f80 · 81f9f80
1 parent f68e28b
commit 81f9f80
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/core/types/block.go b/core/types/block.go
@@ -85,11 +85,11 @@ type Header struct {
 	// WithdrawalsHash was added by EIP-4895 and is ignored in legacy headers.
 	WithdrawalsHash *common.Hash `json:"withdrawalsRoot" rlp:"optional"`
 
-	// BlobGasUsed was added by EIP-4844 and is ignored in legacy headers.
-	BlobGasUsed *uint64 `json:"blobGasUsed" rlp:"optional"`
-
 	// ExcessBlobGas was added by EIP-4844 and is ignored in legacy headers.
 	ExcessBlobGas *uint64 `json:"excessBlobGas" rlp:"optional"`
+
+	// BlobGasUsed was added by EIP-4844 and is ignored in legacy headers.
+	BlobGasUsed *uint64 `json:"blobGasUsed" rlp:"optional"`
 }
 
 // field type overrides for gencodec
@@ -102,8 +102,8 @@ type headerMarshaling struct {
 	Extra         hexutil.Bytes
 	BaseFee       *hexutil.Big
 	Hash          common.Hash `json:"hash"` // adds call to Hash() in MarshalJSON
-	BlobGasUsed   *hexutil.Uint64
 	ExcessBlobGas *hexutil.Uint64
+	BlobGasUsed   *hexutil.Uint64
 }
 
 // Hash returns the block hash of the header, which is simply the keccak256 hash of its

diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go
diff --git a/core/types/gen_header_rlp.go b/core/types/gen_header_rlp.go