forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix StructLog (#672)

Browse source
This commit is contained in:
HAOYUatHZ 2024-03-16 16:23:49 +08:00 committed by GitHub
parent 4ebc036d75
commit badcd0c432
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
eth/tracers/logger/gen_structlog.go
View file

@ -8,6 +8,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/common/math" "github.com/ethereum/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/core/vm"
"github.com/holiman/uint256" "github.com/holiman/uint256"
) )
@ -29,6 +30,7 @@ func (s StructLog) MarshalJSON() ([]byte, error) {
Depth int `json:"depth"` Depth int `json:"depth"`
RefundCounter uint64 `json:"refund"` RefundCounter uint64 `json:"refund"`
Err error `json:"-"` Err error `json:"-"`
ExtraData *types.ExtraData `json:"extraData"`
OpName string `json:"opName"` OpName string `json:"opName"`
ErrorString string `json:"error,omitempty"` ErrorString string `json:"error,omitempty"`
} }
@ -45,6 +47,7 @@ func (s StructLog) MarshalJSON() ([]byte, error) {
enc.Depth = s.Depth enc.Depth = s.Depth
enc.RefundCounter = s.RefundCounter enc.RefundCounter = s.RefundCounter
enc.Err = s.Err enc.Err = s.Err
enc.ExtraData = s.ExtraData
enc.OpName = s.OpName() enc.OpName = s.OpName()
enc.ErrorString = s.ErrorString() enc.ErrorString = s.ErrorString()
return json.Marshal(&enc) return json.Marshal(&enc)
@ -65,6 +68,7 @@ func (s *StructLog) UnmarshalJSON(input []byte) error {
Depth *int `json:"depth"` Depth *int `json:"depth"`
RefundCounter *uint64 `json:"refund"` RefundCounter *uint64 `json:"refund"`
Err error `json:"-"` Err error `json:"-"`
ExtraData *types.ExtraData `json:"extraData"`
} }
var dec StructLog var dec StructLog
if err := json.Unmarshal(input, &dec); err != nil { if err := json.Unmarshal(input, &dec); err != nil {
@ -106,5 +110,8 @@ func (s *StructLog) UnmarshalJSON(input []byte) error {
if dec.Err != nil { if dec.Err != nil {
s.Err = dec.Err s.Err = dec.Err
} }
if dec.ExtraData != nil {
s.ExtraData = dec.ExtraData
}
return nil return nil
} }