diff options
| author | Jaynti Kanani <jdkanani@gmail.com> | 2018-11-26 16:59:04 +0800 |
|---|---|---|
| committer | Martin Holst Swende <martin@swende.se> | 2018-11-26 16:59:04 +0800 |
| commit | 38592a13a3c41f7b6cf29ace473852b68cdb6690 (patch) | |
| tree | 954e5fafd00780c17704c3ea68c5fc003cd78f49 /core | |
| parent | 2a113f6d72d3b612c6686fa2ab8c30f9e7e6e972 (diff) | |
| download | dexon-38592a13a3c41f7b6cf29ace473852b68cdb6690.tar dexon-38592a13a3c41f7b6cf29ace473852b68cdb6690.tar.gz dexon-38592a13a3c41f7b6cf29ace473852b68cdb6690.tar.bz2 dexon-38592a13a3c41f7b6cf29ace473852b68cdb6690.tar.lz dexon-38592a13a3c41f7b6cf29ace473852b68cdb6690.tar.xz dexon-38592a13a3c41f7b6cf29ace473852b68cdb6690.tar.zst dexon-38592a13a3c41f7b6cf29ace473852b68cdb6690.zip | |
fix mixHash/nonce for parity compatible network (#18166)
Diffstat (limited to 'core')
| -rw-r--r-- | core/types/block.go | 4 | ||||
| -rw-r--r-- | core/types/gen_header_json.go | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/core/types/block.go b/core/types/block.go index 8a21bba1e..9d11f60d8 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -81,8 +81,8 @@ type Header struct { GasUsed uint64 `json:"gasUsed" gencodec:"required"` Time *big.Int `json:"timestamp" gencodec:"required"` Extra []byte `json:"extraData" gencodec:"required"` - MixDigest common.Hash `json:"mixHash" gencodec:"required"` - Nonce BlockNonce `json:"nonce" gencodec:"required"` + MixDigest common.Hash `json:"mixHash"` + Nonce BlockNonce `json:"nonce"` } // field type overrides for gencodec diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go index 1b92cd9cf..59a1c9c43 100644 --- a/core/types/gen_header_json.go +++ b/core/types/gen_header_json.go @@ -13,6 +13,7 @@ import ( var _ = (*headerMarshaling)(nil) +// MarshalJSON marshals as JSON. func (h Header) MarshalJSON() ([]byte, error) { type Header struct { ParentHash common.Hash `json:"parentHash" gencodec:"required"` @@ -28,8 +29,8 @@ func (h Header) MarshalJSON() ([]byte, error) { GasUsed hexutil.Uint64 `json:"gasUsed" gencodec:"required"` Time *hexutil.Big `json:"timestamp" gencodec:"required"` Extra hexutil.Bytes `json:"extraData" gencodec:"required"` - MixDigest common.Hash `json:"mixHash" gencodec:"required"` - Nonce BlockNonce `json:"nonce" gencodec:"required"` + MixDigest common.Hash `json:"mixHash"` + Nonce BlockNonce `json:"nonce"` Hash common.Hash `json:"hash"` } var enc Header @@ -52,6 +53,7 @@ func (h Header) MarshalJSON() ([]byte, error) { return json.Marshal(&enc) } +// UnmarshalJSON unmarshals from JSON. func (h *Header) UnmarshalJSON(input []byte) error { type Header struct { ParentHash *common.Hash `json:"parentHash" gencodec:"required"` @@ -67,8 +69,8 @@ func (h *Header) UnmarshalJSON(input []byte) error { GasUsed *hexutil.Uint64 `json:"gasUsed" gencodec:"required"` Time *hexutil.Big `json:"timestamp" gencodec:"required"` Extra *hexutil.Bytes `json:"extraData" gencodec:"required"` - MixDigest *common.Hash `json:"mixHash" gencodec:"required"` - Nonce *BlockNonce `json:"nonce" gencodec:"required"` + MixDigest *common.Hash `json:"mixHash"` + Nonce *BlockNonce `json:"nonce"` } var dec Header if err := json.Unmarshal(input, &dec); err != nil { @@ -126,13 +128,11 @@ func (h *Header) UnmarshalJSON(input []byte) error { return errors.New("missing required field 'extraData' for Header") } h.Extra = *dec.Extra - if dec.MixDigest == nil { - return errors.New("missing required field 'mixHash' for Header") + if dec.MixDigest != nil { + h.MixDigest = *dec.MixDigest } - h.MixDigest = *dec.MixDigest - if dec.Nonce == nil { - return errors.New("missing required field 'nonce' for Header") + if dec.Nonce != nil { + h.Nonce = *dec.Nonce } - h.Nonce = *dec.Nonce return nil } |