gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

all: regenerate codecs with gencodec commit 90983d99de (#15830)

Browse Source 
Fixes #15777 because null is now allowed for hexutil.Bytes.
This commit is contained in:
Felix Lange
2018-01-08 14:13:22 +01:00
committed by Péter Szilágyi
parent 5c2f1e0014
commit 9d06026c19
18 changed files with 96 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/gen_genesis.go
View File

@ -56,7 +56,7 @@ func (g *Genesis) UnmarshalJSON(input []byte) error {
Config *params.ChainConfig `json:"config"`
Nonce *math.HexOrDecimal64 `json:"nonce"`
Timestamp *math.HexOrDecimal64 `json:"timestamp"`
ExtraData hexutil.Bytes `json:"extraData"`
ExtraData *hexutil.Bytes `json:"extraData"`
GasLimit *math.HexOrDecimal64 `json:"gasLimit" gencodec:"required"`
Difficulty *math.HexOrDecimal256 `json:"difficulty" gencodec:"required"`
Mixhash *common.Hash `json:"mixHash"`
@ -80,7 +80,7 @@ func (g *Genesis) UnmarshalJSON(input []byte) error {
g.Timestamp = uint64(*dec.Timestamp)
}
if dec.ExtraData != nil {
g.ExtraData = dec.ExtraData
g.ExtraData = *dec.ExtraData
}
if dec.GasLimit == nil {
return errors.New("missing required field 'gasLimit' for Genesis")