roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

eth/tracer: rename to revertReason (#26574)

Browse Source
This commit is contained in:
rjl493456442 2023-01-31 16:29:17 +08:00 committed by GitHub
parent 78d089b5b7
commit efbd508d21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eth/tracers/internal/tracetest/calltrace_test.go
View File

@ -62,7 +62,7 @@ type callTrace struct {
Input hexutil.Bytes `json:"input"` Input hexutil.Bytes `json:"input"`
Output hexutil.Bytes `json:"output,omitempty"` Output hexutil.Bytes `json:"output,omitempty"`
Error string `json:"error,omitempty"` Error string `json:"error,omitempty"`
Revertal string `json:"revertReason,omitempty"` RevertReason string `json:"revertReason,omitempty"`
Calls []callTrace `json:"calls,omitempty"` Calls []callTrace `json:"calls,omitempty"`
Logs []callLog `json:"logs,omitempty"` Logs []callLog `json:"logs,omitempty"`
Value *hexutil.Big `json:"value,omitempty"` Value *hexutil.Big `json:"value,omitempty"`

4
eth/tracers/native/call.go
View File

@ -50,7 +50,7 @@ type callFrame struct {
Input []byte `json:"input" rlp:"optional"` Input []byte `json:"input" rlp:"optional"`
Output []byte `json:"output,omitempty" rlp:"optional"` Output []byte `json:"output,omitempty" rlp:"optional"`
Error string `json:"error,omitempty" rlp:"optional"` Error string `json:"error,omitempty" rlp:"optional"`
Revertal string `json:"revertReason,omitempty"` RevertReason string `json:"revertReason,omitempty"`
Calls []callFrame `json:"calls,omitempty" rlp:"optional"` Calls []callFrame `json:"calls,omitempty" rlp:"optional"`
Logs []callLog `json:"logs,omitempty" rlp:"optional"` Logs []callLog `json:"logs,omitempty" rlp:"optional"`
// Placed at end on purpose. The RLP will be decoded to 0 instead of // Placed at end on purpose. The RLP will be decoded to 0 instead of
@ -84,7 +84,7 @@ func (f *callFrame) processOutput(output []byte, err error) {
return return
} }
if unpacked, err := abi.UnpackRevert(output); err == nil { if unpacked, err := abi.UnpackRevert(output); err == nil {
f.Revertal = unpacked f.RevertReason = unpacked
} }
} }

10
eth/tracers/native/gen_callframe_json.go
View File

@ -24,7 +24,7 @@ func (c callFrame) MarshalJSON() ([]byte, error) {
Input hexutil.Bytes `json:"input" rlp:"optional"` Input hexutil.Bytes `json:"input" rlp:"optional"`
Output hexutil.Bytes `json:"output,omitempty" rlp:"optional"` Output hexutil.Bytes `json:"output,omitempty" rlp:"optional"`
Error string `json:"error,omitempty" rlp:"optional"` Error string `json:"error,omitempty" rlp:"optional"`
Revertal string `json:"revertReason,omitempty"` RevertReason string `json:"revertReason,omitempty"`
Calls []callFrame `json:"calls,omitempty" rlp:"optional"` Calls []callFrame `json:"calls,omitempty" rlp:"optional"`
Logs []callLog `json:"logs,omitempty" rlp:"optional"` Logs []callLog `json:"logs,omitempty" rlp:"optional"`
Value *hexutil.Big `json:"value,omitempty" rlp:"optional"` Value *hexutil.Big `json:"value,omitempty" rlp:"optional"`
@ -39,7 +39,7 @@ func (c callFrame) MarshalJSON() ([]byte, error) {
enc.Input = c.Input enc.Input = c.Input
enc.Output = c.Output enc.Output = c.Output
enc.Error = c.Error enc.Error = c.Error
enc.Revertal = c.Revertal enc.RevertReason = c.RevertReason
enc.Calls = c.Calls enc.Calls = c.Calls
enc.Logs = c.Logs enc.Logs = c.Logs
enc.Value = (*hexutil.Big)(c.Value) enc.Value = (*hexutil.Big)(c.Value)
@ -58,7 +58,7 @@ func (c *callFrame) UnmarshalJSON(input []byte) error {
Input *hexutil.Bytes `json:"input" rlp:"optional"` Input *hexutil.Bytes `json:"input" rlp:"optional"`
Output *hexutil.Bytes `json:"output,omitempty" rlp:"optional"` Output *hexutil.Bytes `json:"output,omitempty" rlp:"optional"`
Error *string `json:"error,omitempty" rlp:"optional"` Error *string `json:"error,omitempty" rlp:"optional"`
Revertal *string `json:"revertReason,omitempty"` RevertReason *string `json:"revertReason,omitempty"`
Calls []callFrame `json:"calls,omitempty" rlp:"optional"` Calls []callFrame `json:"calls,omitempty" rlp:"optional"`
Logs []callLog `json:"logs,omitempty" rlp:"optional"` Logs []callLog `json:"logs,omitempty" rlp:"optional"`
Value *hexutil.Big `json:"value,omitempty" rlp:"optional"` Value *hexutil.Big `json:"value,omitempty" rlp:"optional"`
@ -91,8 +91,8 @@ func (c *callFrame) UnmarshalJSON(input []byte) error {
if dec.Error != nil { if dec.Error != nil {
c.Error = *dec.Error c.Error = *dec.Error
} }
if dec.Revertal != nil { if dec.RevertReason != nil {
c.Revertal = *dec.Revertal c.RevertReason = *dec.RevertReason
} }
if dec.Calls != nil { if dec.Calls != nil {
c.Calls = dec.Calls c.Calls = dec.Calls