forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-17 18:30:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(core): hex encode validators/validator/penalties in Header JSON (#2057)

Browse source 
Ensure JSON marshal/unmarshal uses hex for validators, validator, and penalties so Header encoding is consistent with RPC output.
This commit is contained in:
Daniel Liu 2026-02-28 20:56:37 +08:00 committed by GitHub
parent 3367939f96
commit 3454841ade
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/types/block.go
View file

@ -95,6 +95,9 @@ type headerMarshaling struct {
GasUsed hexutil.Uint64 GasUsed hexutil.Uint64
Time hexutil.Uint64 Time hexutil.Uint64
Extra hexutil.Bytes Extra hexutil.Bytes
Validators hexutil.Bytes
Validator hexutil.Bytes
Penalties hexutil.Bytes
BaseFee *hexutil.Big BaseFee *hexutil.Big
Hash common.Hash `json:"hash"` // adds call to Hash() in MarshalJSON Hash common.Hash `json:"hash"` // adds call to Hash() in MarshalJSON
} }

18
core/types/gen_header_json.go
View file

@ -31,9 +31,9 @@ func (h Header) MarshalJSON() ([]byte, error) {
Extra hexutil.Bytes `json:"extraData" gencodec:"required"` Extra hexutil.Bytes `json:"extraData" gencodec:"required"`
MixDigest common.Hash `json:"mixHash" gencodec:"required"` MixDigest common.Hash `json:"mixHash" gencodec:"required"`
Nonce BlockNonce `json:"nonce" gencodec:"required"` Nonce BlockNonce `json:"nonce" gencodec:"required"`
Validators []byte `json:"validators" gencodec:"required"` Validators hexutil.Bytes `json:"validators" gencodec:"required"`
Validator []byte `json:"validator" gencodec:"required"` Validator hexutil.Bytes `json:"validator" gencodec:"required"`
Penalties []byte `json:"penalties" gencodec:"required"` Penalties hexutil.Bytes `json:"penalties" gencodec:"required"`
BaseFee *hexutil.Big `json:"baseFeePerGas" rlp:"optional"` BaseFee *hexutil.Big `json:"baseFeePerGas" rlp:"optional"`
Hash common.Hash `json:"hash"` Hash common.Hash `json:"hash"`
} }
@ -79,9 +79,9 @@ func (h *Header) UnmarshalJSON(input []byte) error {
Extra *hexutil.Bytes `json:"extraData" gencodec:"required"` Extra *hexutil.Bytes `json:"extraData" gencodec:"required"`
MixDigest *common.Hash `json:"mixHash" gencodec:"required"` MixDigest *common.Hash `json:"mixHash" gencodec:"required"`
Nonce *BlockNonce `json:"nonce" gencodec:"required"` Nonce *BlockNonce `json:"nonce" gencodec:"required"`
Validators []byte `json:"validators" gencodec:"required"` Validators *hexutil.Bytes `json:"validators" gencodec:"required"`
Validator []byte `json:"validator" gencodec:"required"` Validator *hexutil.Bytes `json:"validator" gencodec:"required"`
Penalties []byte `json:"penalties" gencodec:"required"` Penalties *hexutil.Bytes `json:"penalties" gencodec:"required"`
BaseFee *hexutil.Big `json:"baseFeePerGas" rlp:"optional"` BaseFee *hexutil.Big `json:"baseFeePerGas" rlp:"optional"`
} }
var dec Header var dec Header
@ -151,15 +151,15 @@ func (h *Header) UnmarshalJSON(input []byte) error {
if dec.Validators == nil { if dec.Validators == nil {
return errors.New("missing required field 'validators' for Header") return errors.New("missing required field 'validators' for Header")
} }
h.Validators = dec.Validators h.Validators = *dec.Validators
if dec.Validator == nil { if dec.Validator == nil {
return errors.New("missing required field 'validator' for Header") return errors.New("missing required field 'validator' for Header")
} }
h.Validator = dec.Validator h.Validator = *dec.Validator
if dec.Penalties == nil { if dec.Penalties == nil {
return errors.New("missing required field 'penalties' for Header") return errors.New("missing required field 'penalties' for Header")
} }
h.Penalties = dec.Penalties h.Penalties = *dec.Penalties
if dec.BaseFee != nil { if dec.BaseFee != nil {
h.BaseFee = (*big.Int)(dec.BaseFee) h.BaseFee = (*big.Int)(dec.BaseFee)
} }