Skip to content

Commit d955653

Browse files
core/types: put header fields in correct order (#27791)
1 parent 57268f7 commit d955653

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

core/types/block.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ type Header struct {
8585
// WithdrawalsHash was added by EIP-4895 and is ignored in legacy headers.
8686
WithdrawalsHash *common.Hash `json:"withdrawalsRoot" rlp:"optional"`
8787

88-
// ExcessBlobGas was added by EIP-4844 and is ignored in legacy headers.
89-
ExcessBlobGas *uint64 `json:"excessBlobGas" rlp:"optional"`
90-
9188
// BlobGasUsed was added by EIP-4844 and is ignored in legacy headers.
9289
BlobGasUsed *uint64 `json:"blobGasUsed" rlp:"optional"`
90+
91+
// ExcessBlobGas was added by EIP-4844 and is ignored in legacy headers.
92+
ExcessBlobGas *uint64 `json:"excessBlobGas" rlp:"optional"`
9393
}
9494

9595
// field type overrides for gencodec
@@ -102,8 +102,8 @@ type headerMarshaling struct {
102102
Extra hexutil.Bytes
103103
BaseFee *hexutil.Big
104104
Hash common.Hash `json:"hash"` // adds call to Hash() in MarshalJSON
105-
ExcessBlobGas *hexutil.Uint64
106105
BlobGasUsed *hexutil.Uint64
106+
ExcessBlobGas *hexutil.Uint64
107107
}
108108

109109
// Hash returns the block hash of the header, which is simply the keccak256 hash of its

core/types/gen_header_json.go

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/types/gen_header_rlp.go

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)