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 /eth/gen_config.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 'eth/gen_config.go')
| -rw-r--r-- | eth/gen_config.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eth/gen_config.go b/eth/gen_config.go index 92cab57e1..4f2e82d94 100644 --- a/eth/gen_config.go +++ b/eth/gen_config.go @@ -68,7 +68,7 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { DatabaseCache *int Etherbase *common.Address `toml:",omitempty"` MinerThreads *int `toml:",omitempty"` - ExtraData hexutil.Bytes `toml:",omitempty"` + ExtraData *hexutil.Bytes `toml:",omitempty"` GasPrice *big.Int Ethash *ethash.Config TxPool *core.TxPoolConfig @@ -111,7 +111,7 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { c.MinerThreads = *dec.MinerThreads } if dec.ExtraData != nil { - c.ExtraData = dec.ExtraData + c.ExtraData = *dec.ExtraData } if dec.GasPrice != nil { c.GasPrice = dec.GasPrice |