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/vm | |
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/vm')
-rw-r--r-- | core/vm/gen_structlog.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/vm/gen_structlog.go b/core/vm/gen_structlog.go index 890c6624d..ade3ca631 100644 --- a/core/vm/gen_structlog.go +++ b/core/vm/gen_structlog.go @@ -55,7 +55,7 @@ func (s *StructLog) UnmarshalJSON(input []byte) error { Op *OpCode `json:"op"` Gas *math.HexOrDecimal64 `json:"gas"` GasCost *math.HexOrDecimal64 `json:"gasCost"` - Memory hexutil.Bytes `json:"memory"` + Memory *hexutil.Bytes `json:"memory"` MemorySize *int `json:"memSize"` Stack []*math.HexOrDecimal256 `json:"stack"` Storage map[common.Hash]common.Hash `json:"-"` @@ -79,7 +79,7 @@ func (s *StructLog) UnmarshalJSON(input []byte) error { s.GasCost = uint64(*dec.GasCost) } if dec.Memory != nil { - s.Memory = dec.Memory + s.Memory = *dec.Memory } if dec.MemorySize != nil { s.MemorySize = *dec.MemorySize |