diff options
| author | Felix Lange <fjl@users.noreply.github.com> | 2018-01-08 21:13:22 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2018-01-08 21:13:22 +0800 |
| commit | 9d06026c1991fdd8f034ce194fa20a0740c21810 (patch) | |
| tree | 8625b7c087dfcd8cf8f087113c7242cf0d7639cd /core/gen_genesis.go | |
| parent | 5c2f1e00148f16655d3fb63b93920b1108165c56 (diff) | |
| download | dexon-9d06026c1991fdd8f034ce194fa20a0740c21810.tar dexon-9d06026c1991fdd8f034ce194fa20a0740c21810.tar.gz dexon-9d06026c1991fdd8f034ce194fa20a0740c21810.tar.bz2 dexon-9d06026c1991fdd8f034ce194fa20a0740c21810.tar.lz dexon-9d06026c1991fdd8f034ce194fa20a0740c21810.tar.xz dexon-9d06026c1991fdd8f034ce194fa20a0740c21810.tar.zst dexon-9d06026c1991fdd8f034ce194fa20a0740c21810.zip | |
all: regenerate codecs with gencodec commit 90983d99de (#15830)
Fixes #15777 because null is now allowed for hexutil.Bytes.
Diffstat (limited to 'core/gen_genesis.go')
| -rw-r--r-- | core/gen_genesis.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/gen_genesis.go b/core/gen_genesis.go index 6f941e35a..bb8ea1d6a 100644 --- a/core/gen_genesis.go +++ b/core/gen_genesis.go @@ -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") |