Commit a01fa60c authored by zhiqiangxu's avatar zhiqiangxu Committed by GitHub

show label on `Host.onFault` (#13503)

* show label on fault

* also show label for onExit
parent 28c8c06c
...@@ -531,9 +531,9 @@ func (h *Host) onExit(depth int, output []byte, gasUsed uint64, err error, rever ...@@ -531,9 +531,9 @@ func (h *Host) onExit(depth int, output []byte, gasUsed uint64, err error, rever
if reverted { if reverted {
h.LogCallStack() h.LogCallStack()
if msg, revertInspectErr := abi.UnpackRevert(output); revertInspectErr == nil { if msg, revertInspectErr := abi.UnpackRevert(output); revertInspectErr == nil {
h.log.Warn("Revert", "addr", addr, "err", err, "revertMsg", msg, "depth", depth) h.log.Warn("Revert", "addr", addr, "label", h.labels[addr], "err", err, "revertMsg", msg, "depth", depth)
} else { } else {
h.log.Warn("Revert", "addr", addr, "err", err, "revertData", hexutil.Bytes(output), "depth", depth) h.log.Warn("Revert", "addr", addr, "label", h.labels[addr], "err", err, "revertData", hexutil.Bytes(output), "depth", depth)
} }
} }
...@@ -543,7 +543,7 @@ func (h *Host) onExit(depth int, output []byte, gasUsed uint64, err error, rever ...@@ -543,7 +543,7 @@ func (h *Host) onExit(depth int, output []byte, gasUsed uint64, err error, rever
// onFault is a trace-hook, catches things more generic than regular EVM reverts. // onFault is a trace-hook, catches things more generic than regular EVM reverts.
func (h *Host) onFault(pc uint64, op byte, gas, cost uint64, scope tracing.OpContext, depth int, err error) { func (h *Host) onFault(pc uint64, op byte, gas, cost uint64, scope tracing.OpContext, depth int, err error) {
h.log.Warn("Fault", "addr", scope.Address(), "err", err, "depth", depth) h.log.Warn("Fault", "addr", scope.Address(), "label", h.labels[scope.Address()], "err", err, "depth", depth)
} }
// unwindCallstack is a helper to remove call-stack entries. // unwindCallstack is a helper to remove call-stack entries.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment